move TMGrammars + Emmet (#69610)

microsoft · Mar 9, 2019 · 85d9833 · 85d9833
1 parent 6112a6a
commit 85d9833
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 12 deletions.
diff --git a/...ron-browser/actions/expandAbbreviation.ts → ...met/browser/actions/expandAbbreviation.ts b/...ron-browser/actions/expandAbbreviation.ts → ...met/browser/actions/expandAbbreviation.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import * as nls from 'vs/nls';
-import { EmmetEditorAction } from 'vs/workbench/contrib/emmet/electron-browser/emmetActions';
+import { EmmetEditorAction } from 'vs/workbench/contrib/emmet/browser/emmetActions';
 import { registerEditorAction } from 'vs/editor/browser/editorExtensions';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { KeyCode } from 'vs/base/common/keyCodes';

diff --git a/src/vs/workbench/contrib/emmet/browser/emmet.browser.contribution.ts b/src/vs/workbench/contrib/emmet/browser/emmet.browser.contribution.ts
diff --git a/...et/electron-browser/emmet.contribution.ts → ...ntrib/emmet/browser/emmet.contribution.ts b/...et/electron-browser/emmet.contribution.ts → ...ntrib/emmet/browser/emmet.contribution.ts
@@ -3,5 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import './actions/showEmmetCommands';
 import './actions/expandAbbreviation';
 
diff --git a/...ib/emmet/electron-browser/emmetActions.ts → ...nch/contrib/emmet/browser/emmetActions.ts b/...ib/emmet/electron-browser/emmetActions.ts → ...nch/contrib/emmet/browser/emmetActions.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { EditorAction, ServicesAccessor, IActionOptions } from 'vs/editor/browser/editorExtensions';
-import { grammarsExtPoint, ITMSyntaxExtensionPoint } from 'vs/workbench/services/textMate/electron-browser/TMGrammars';
+import { grammarsExtPoint, ITMSyntaxExtensionPoint } from 'vs/workbench/services/textMate/common/TMGrammars';
 import { IModeService } from 'vs/editor/common/services/modeService';
 import { IExtensionService, ExtensionPointContribution } from 'vs/workbench/services/extensions/common/extensions';
 import { ICommandService } from 'vs/platform/commands/common/commands';

diff --git a/...test/electron-browser/emmetAction.test.ts → ...ib/emmet/test/browser/emmetAction.test.ts b/...test/electron-browser/emmetAction.test.ts → ...ib/emmet/test/browser/emmetAction.test.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IGrammarContributions, ILanguageIdentifierResolver, EmmetEditorAction } from 'vs/workbench/contrib/emmet/electron-browser/emmetActions';
+import { IGrammarContributions, ILanguageIdentifierResolver, EmmetEditorAction } from 'vs/workbench/contrib/emmet/browser/emmetActions';
 import { withTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
 import * as assert from 'assert';
 import { LanguageId, LanguageIdentifier } from 'vs/editor/common/modes';

diff --git a/...s/textMate/electron-browser/TMGrammars.ts → ...ch/services/textMate/common/TMGrammars.ts b/...s/textMate/electron-browser/TMGrammars.ts → ...ch/services/textMate/common/TMGrammars.ts
diff --git a/src/vs/workbench/services/textMate/electron-browser/textMateService.ts b/src/vs/workbench/services/textMate/electron-browser/textMateService.ts
@@ -20,7 +20,7 @@ import { IFileService } from 'vs/platform/files/common/files';
 import { ILogService } from 'vs/platform/log/common/log';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { ExtensionMessageCollector } from 'vs/workbench/services/extensions/common/extensionsRegistry';
-import { IEmbeddedLanguagesMap, ITMSyntaxExtensionPoint, TokenTypesContribution, grammarsExtPoint } from 'vs/workbench/services/textMate/electron-browser/TMGrammars';
+import { IEmbeddedLanguagesMap, ITMSyntaxExtensionPoint, TokenTypesContribution, grammarsExtPoint } from 'vs/workbench/services/textMate/common/TMGrammars';
 import { ITextMateService } from 'vs/workbench/services/textMate/common/textMateService';
 import { ITokenColorizationRule, IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
 import { IEmbeddedLanguagesMap as IEmbeddedLanguagesMap2, IGrammar, ITokenTypeMap, Registry, StackElement, StandardTokenType } from 'vscode-textmate';

diff --git a/src/vs/workbench/workbench.main.ts b/src/vs/workbench/workbench.main.ts
@@ -237,8 +237,7 @@ import 'vs/workbench/contrib/relauncher/electron-browser/relauncher.contribution
 import 'vs/workbench/contrib/tasks/electron-browser/task.contribution';
 
 // Emmet
-import 'vs/workbench/contrib/emmet/browser/emmet.browser.contribution';
-import 'vs/workbench/contrib/emmet/electron-browser/emmet.contribution';
+import 'vs/workbench/contrib/emmet/browser/emmet.contribution';
 
 // CodeEditor Contributions
 import 'vs/workbench/contrib/codeEditor/browser/codeEditor.contribution';