From c60d46a2fbe58e508ed00004c1422f09cda60c4c Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Fri, 3 Jun 2016 12:31:28 +0200 Subject: [PATCH] Rename richEditSupport to languageConfigurationRegistry --- build/monaco/monaco.d.ts.recipe | 2 +- .../browser/standalone/standaloneLanguages.ts | 2 +- src/vs/editor/common/languages.common.ts | 2 +- ...rt.ts => languageConfigurationRegistry.ts} | 19 +++++++++++++++++++ src/vs/editor/common/services/modeService.ts | 2 +- .../editor/common/services/modeServiceImpl.ts | 2 +- .../test/common/tokenSelectionSupport.test.ts | 2 +- src/vs/editor/node/languageConfiguration.ts | 2 +- .../standalone-languages/test/testUtil.ts | 2 +- .../test/common/commands/shiftCommand.test.ts | 2 +- .../test/common/controller/cursor.test.ts | 2 +- .../test/common/mocks/mockModeService.ts | 2 +- src/vs/editor/test/common/modesTestUtils.ts | 2 +- src/vs/editor/test/common/testModes.ts | 2 +- src/vs/languages/css/common/css.ts | 2 +- .../languages/handlebars/common/handlebars.ts | 2 +- src/vs/languages/html/common/html.ts | 2 +- .../languages/html/test/common/html.test.ts | 2 +- src/vs/languages/json/common/json.ts | 2 +- src/vs/languages/less/common/less.ts | 2 +- src/vs/languages/markdown/common/markdown.ts | 2 +- src/vs/languages/php/common/php.ts | 2 +- src/vs/languages/razor/common/razor.ts | 2 +- src/vs/languages/sass/common/sass.ts | 2 +- src/vs/languages/typescript/common/mode.ts | 2 +- .../parts/output/common/outputMode.ts | 2 +- 26 files changed, 44 insertions(+), 25 deletions(-) rename src/vs/editor/common/modes/{supports/richEditSupport.ts => languageConfigurationRegistry.ts} (88%) diff --git a/build/monaco/monaco.d.ts.recipe b/build/monaco/monaco.d.ts.recipe index 3ff950f8732..45069658999 100644 --- a/build/monaco/monaco.d.ts.recipe +++ b/build/monaco/monaco.d.ts.recipe @@ -73,7 +73,7 @@ declare module monaco.editor { declare module monaco.languages { #includeAll(vs/editor/browser/standalone/standaloneLanguages;modes.=>;editorCommon.=>editor.): -#include(vs/editor/common/modes/supports/richEditSupport): CommentRule, IRichLanguageConfiguration +#include(vs/editor/common/modes/languageConfigurationRegistry): CommentRule, IRichLanguageConfiguration #include(vs/editor/common/modes/supports/onEnter): IIndentationRules, IOnEnterRegExpRules #include(vs/editor/common/modes/supports/electricCharacter): IBracketElectricCharacterContribution, IDocComment #includeAll(vs/editor/common/modes;editorCommon.IRange=>IRange;editorCommon.IPosition=>IPosition;editorCommon.=>editor.;IToken2=>IToken;ILineTokens2=>ILineTokens;IState2=>IState): diff --git a/src/vs/editor/browser/standalone/standaloneLanguages.ts b/src/vs/editor/browser/standalone/standaloneLanguages.ts index c6935447d03..dee2d4eb3b2 100644 --- a/src/vs/editor/browser/standalone/standaloneLanguages.ts +++ b/src/vs/editor/browser/standalone/standaloneLanguages.ts @@ -17,7 +17,7 @@ import {ILanguageExtensionPoint} from 'vs/editor/common/services/modeService'; import {ensureStaticPlatformServices} from 'vs/editor/browser/standalone/standaloneServices'; import * as modes from 'vs/editor/common/modes'; import {startup} from './standaloneCodeEditor'; -import {IRichLanguageConfiguration} from 'vs/editor/common/modes/supports/richEditSupport'; +import {IRichLanguageConfiguration} from 'vs/editor/common/modes/languageConfigurationRegistry'; import * as editorCommon from 'vs/editor/common/editorCommon'; import {Position} from 'vs/editor/common/core/position'; import {Range} from 'vs/editor/common/core/range'; diff --git a/src/vs/editor/common/languages.common.ts b/src/vs/editor/common/languages.common.ts index 14bcb27c297..8268267aea3 100644 --- a/src/vs/editor/common/languages.common.ts +++ b/src/vs/editor/common/languages.common.ts @@ -35,7 +35,7 @@ import 'vs/editor/common/modes/abstractState'; import 'vs/editor/common/modes/monarch/monarchCommon'; import 'vs/editor/common/modes/monarch/monarchLexer'; import 'vs/editor/common/modes/monarch/monarchCompile'; -import 'vs/editor/common/modes/supports/richEditSupport'; +import 'vs/editor/common/modes/languageConfigurationRegistry'; import 'vs/editor/common/modes/supports/suggestSupport'; import 'vs/editor/common/modes/supports/tokenizationSupport'; import 'vs/editor/common/services/modelService'; diff --git a/src/vs/editor/common/modes/supports/richEditSupport.ts b/src/vs/editor/common/modes/languageConfigurationRegistry.ts similarity index 88% rename from src/vs/editor/common/modes/supports/richEditSupport.ts rename to src/vs/editor/common/modes/languageConfigurationRegistry.ts index 301a4cafb41..09aa5e4c377 100644 --- a/src/vs/editor/common/modes/supports/richEditSupport.ts +++ b/src/vs/editor/common/modes/languageConfigurationRegistry.ts @@ -11,6 +11,7 @@ import {CharacterPairSupport} from 'vs/editor/common/modes/supports/characterPai import {BracketElectricCharacterSupport, IBracketElectricCharacterContribution} from 'vs/editor/common/modes/supports/electricCharacter'; import {IIndentationRules, IOnEnterRegExpRules, IOnEnterSupportOptions, OnEnterSupport} from 'vs/editor/common/modes/supports/onEnter'; import {RichEditBrackets} from 'vs/editor/common/modes/supports/richEditBrackets'; +// import Event, {Emitter} from 'vs/base/common/event'; export interface CommentRule { lineComment?: string; @@ -122,3 +123,21 @@ export class RichEditSupport implements IRichEditSupport { } } + +// export class LanguageConfigurationRegistryImpl { + +// private _entries: {[languageId:string]:RichEditSupport;}; + +// private _onDidChange: Emitter = new Emitter(); +// public onDidChange: Event = this._onDidChange.event; + +// constructor() { +// this._entries = Object.create(null); +// } + +// public register(languageId:string, configuration:IRichLanguageConfiguration): void { +// console.log('TODO!'); +// } +// } + +// export const LanguageConfigurationRegistry = new LanguageConfigurationRegistryImpl(); \ No newline at end of file diff --git a/src/vs/editor/common/services/modeService.ts b/src/vs/editor/common/services/modeService.ts index 8b1fd9ea3c7..ee72185820a 100644 --- a/src/vs/editor/common/services/modeService.ts +++ b/src/vs/editor/common/services/modeService.ts @@ -9,7 +9,7 @@ import {IDisposable} from 'vs/base/common/lifecycle'; import {TPromise} from 'vs/base/common/winjs.base'; import {ServiceIdentifier, createDecorator} from 'vs/platform/instantiation/common/instantiation'; import * as modes from 'vs/editor/common/modes'; -import {IRichLanguageConfiguration} from 'vs/editor/common/modes/supports/richEditSupport'; +import {IRichLanguageConfiguration} from 'vs/editor/common/modes/languageConfigurationRegistry'; export var IModeService = createDecorator('modeService'); diff --git a/src/vs/editor/common/services/modeServiceImpl.ts b/src/vs/editor/common/services/modeServiceImpl.ts index 270b9863767..dcd243eb762 100644 --- a/src/vs/editor/common/services/modeServiceImpl.ts +++ b/src/vs/editor/common/services/modeServiceImpl.ts @@ -20,7 +20,7 @@ import {IThreadService, Remotable, ThreadAffinity} from 'vs/platform/thread/comm import * as modes from 'vs/editor/common/modes'; import {FrankensteinMode} from 'vs/editor/common/modes/abstractMode'; import {ILegacyLanguageDefinition, ModesRegistry} from 'vs/editor/common/modes/modesRegistry'; -import {IRichLanguageConfiguration, RichEditSupport} from 'vs/editor/common/modes/supports/richEditSupport'; +import {IRichLanguageConfiguration, RichEditSupport} from 'vs/editor/common/modes/languageConfigurationRegistry'; import {LanguagesRegistry} from 'vs/editor/common/services/languagesRegistry'; import {ILanguageExtensionPoint, IValidLanguageExtensionPoint, IModeLookupResult, IModeService} from 'vs/editor/common/services/modeService'; import {IConfigurationService} from 'vs/platform/configuration/common/configuration'; diff --git a/src/vs/editor/contrib/smartSelect/test/common/tokenSelectionSupport.test.ts b/src/vs/editor/contrib/smartSelect/test/common/tokenSelectionSupport.test.ts index 2c60be0d67a..eeb772adf74 100644 --- a/src/vs/editor/contrib/smartSelect/test/common/tokenSelectionSupport.test.ts +++ b/src/vs/editor/contrib/smartSelect/test/common/tokenSelectionSupport.test.ts @@ -11,7 +11,7 @@ import {IMode, IRichEditSupport, IndentAction} from 'vs/editor/common/modes'; import {TokenSelectionSupport} from 'vs/editor/contrib/smartSelect/common/tokenSelectionSupport'; import {createMockModelService} from 'vs/editor/test/common/servicesTestUtils'; import {MockTokenizingMode} from 'vs/editor/test/common/mocks/mockMode'; -import {RichEditSupport} from 'vs/editor/common/modes/supports/richEditSupport'; +import {RichEditSupport} from 'vs/editor/common/modes/languageConfigurationRegistry'; class MockJSMode extends MockTokenizingMode { diff --git a/src/vs/editor/node/languageConfiguration.ts b/src/vs/editor/node/languageConfiguration.ts index ee164b73212..bb3a0a2021e 100644 --- a/src/vs/editor/node/languageConfiguration.ts +++ b/src/vs/editor/node/languageConfiguration.ts @@ -7,7 +7,7 @@ import * as nls from 'vs/nls'; import {parse} from 'vs/base/common/json'; import {readFile} from 'vs/base/node/pfs'; -import {IRichLanguageConfiguration} from 'vs/editor/common/modes/supports/richEditSupport'; +import {IRichLanguageConfiguration} from 'vs/editor/common/modes/languageConfigurationRegistry'; import {IModeService} from 'vs/editor/common/services/modeService'; import {IAutoClosingPair} from 'vs/editor/common/modes'; diff --git a/src/vs/editor/standalone-languages/test/testUtil.ts b/src/vs/editor/standalone-languages/test/testUtil.ts index 4a619b3d2c1..fc6fe1b8379 100644 --- a/src/vs/editor/standalone-languages/test/testUtil.ts +++ b/src/vs/editor/standalone-languages/test/testUtil.ts @@ -5,7 +5,7 @@ 'use strict'; -import {RichEditSupport} from 'vs/editor/common/modes/supports/richEditSupport'; +import {RichEditSupport} from 'vs/editor/common/modes/languageConfigurationRegistry'; import {createOnEnterAsserter, executeMonarchTokenizationTests} from 'vs/editor/test/common/modesUtil'; import {ILanguage, IRichLanguageConfiguration} from '../types'; diff --git a/src/vs/editor/test/common/commands/shiftCommand.test.ts b/src/vs/editor/test/common/commands/shiftCommand.test.ts index 1efc7d72172..3f630b5401a 100644 --- a/src/vs/editor/test/common/commands/shiftCommand.test.ts +++ b/src/vs/editor/test/common/commands/shiftCommand.test.ts @@ -9,7 +9,7 @@ import {ShiftCommand} from 'vs/editor/common/commands/shiftCommand'; import {Selection} from 'vs/editor/common/core/selection'; import {IIdentifiedSingleEditOperation} from 'vs/editor/common/editorCommon'; import {IRichEditSupport, IndentAction} from 'vs/editor/common/modes'; -import {RichEditSupport} from 'vs/editor/common/modes/supports/richEditSupport'; +import {RichEditSupport} from 'vs/editor/common/modes/languageConfigurationRegistry'; import {createSingleEditOp, getEditOperation, testCommand} from 'vs/editor/test/common/commands/commandTestUtils'; import {withEditorModel} from 'vs/editor/test/common/editorTestUtils'; import {MockMode} from 'vs/editor/test/common/mocks/mockMode'; diff --git a/src/vs/editor/test/common/controller/cursor.test.ts b/src/vs/editor/test/common/controller/cursor.test.ts index 4595547c5ec..b63eedd6106 100644 --- a/src/vs/editor/test/common/controller/cursor.test.ts +++ b/src/vs/editor/test/common/controller/cursor.test.ts @@ -17,7 +17,7 @@ import { } from 'vs/editor/common/editorCommon'; import {Model} from 'vs/editor/common/model/model'; import {IMode, IRichEditSupport, IndentAction} from 'vs/editor/common/modes'; -import {RichEditSupport} from 'vs/editor/common/modes/supports/richEditSupport'; +import {RichEditSupport} from 'vs/editor/common/modes/languageConfigurationRegistry'; import {MockConfiguration} from 'vs/editor/test/common/mocks/mockConfiguration'; import {BracketMode} from 'vs/editor/test/common/testModes'; diff --git a/src/vs/editor/test/common/mocks/mockModeService.ts b/src/vs/editor/test/common/mocks/mockModeService.ts index 585e09e485a..df36f81844a 100644 --- a/src/vs/editor/test/common/mocks/mockModeService.ts +++ b/src/vs/editor/test/common/mocks/mockModeService.ts @@ -9,7 +9,7 @@ import {IDisposable} from 'vs/base/common/lifecycle'; import {TPromise} from 'vs/base/common/winjs.base'; import {ServiceIdentifier} from 'vs/platform/instantiation/common/instantiation'; import * as modes from 'vs/editor/common/modes'; -import {IRichLanguageConfiguration} from 'vs/editor/common/modes/supports/richEditSupport'; +import {IRichLanguageConfiguration} from 'vs/editor/common/modes/languageConfigurationRegistry'; import {IModeService, IModeLookupResult} from 'vs/editor/common/services/modeService'; export class MockModeService implements IModeService { diff --git a/src/vs/editor/test/common/modesTestUtils.ts b/src/vs/editor/test/common/modesTestUtils.ts index 10edb1a5162..30c887dec2f 100644 --- a/src/vs/editor/test/common/modesTestUtils.ts +++ b/src/vs/editor/test/common/modesTestUtils.ts @@ -6,7 +6,7 @@ import {Arrays} from 'vs/editor/common/core/arrays'; import * as modes from 'vs/editor/common/modes'; -import {RichEditSupport} from 'vs/editor/common/modes/supports/richEditSupport'; +import {RichEditSupport} from 'vs/editor/common/modes/languageConfigurationRegistry'; import {MockMode} from 'vs/editor/test/common/mocks/mockMode'; import {ModeTransition} from 'vs/editor/common/core/modeTransition'; diff --git a/src/vs/editor/test/common/testModes.ts b/src/vs/editor/test/common/testModes.ts index 49e782ed37c..f656d5c160b 100644 --- a/src/vs/editor/test/common/testModes.ts +++ b/src/vs/editor/test/common/testModes.ts @@ -6,7 +6,7 @@ import * as modes from 'vs/editor/common/modes'; import {AbstractState} from 'vs/editor/common/modes/abstractState'; -import {RichEditSupport} from 'vs/editor/common/modes/supports/richEditSupport'; +import {RichEditSupport} from 'vs/editor/common/modes/languageConfigurationRegistry'; import {TokenizationSupport} from 'vs/editor/common/modes/supports/tokenizationSupport'; import {MockMode} from 'vs/editor/test/common/mocks/mockMode'; diff --git a/src/vs/languages/css/common/css.ts b/src/vs/languages/css/common/css.ts index 83a5aed0df6..f6e8011a10e 100644 --- a/src/vs/languages/css/common/css.ts +++ b/src/vs/languages/css/common/css.ts @@ -17,7 +17,7 @@ import {AbstractState} from 'vs/editor/common/modes/abstractState'; import {IMarker} from 'vs/platform/markers/common/markers'; import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation'; import {IThreadService, ThreadAffinity} from 'vs/platform/thread/common/thread'; -import {RichEditSupport} from 'vs/editor/common/modes/supports/richEditSupport'; +import {RichEditSupport} from 'vs/editor/common/modes/languageConfigurationRegistry'; import {TokenizationSupport} from 'vs/editor/common/modes/supports/tokenizationSupport'; import {wireCancellationToken} from 'vs/base/common/async'; diff --git a/src/vs/languages/handlebars/common/handlebars.ts b/src/vs/languages/handlebars/common/handlebars.ts index 898f46fde76..34f3b264485 100644 --- a/src/vs/languages/handlebars/common/handlebars.ts +++ b/src/vs/languages/handlebars/common/handlebars.ts @@ -10,7 +10,7 @@ import handlebarsTokenTypes = require('vs/languages/handlebars/common/handlebars import htmlWorker = require('vs/languages/html/common/htmlWorker'); import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation'; import {IModeService} from 'vs/editor/common/services/modeService'; -import {RichEditSupport} from 'vs/editor/common/modes/supports/richEditSupport'; +import {RichEditSupport} from 'vs/editor/common/modes/languageConfigurationRegistry'; import {createWordRegExp} from 'vs/editor/common/modes/abstractMode'; import {ILeavingNestedModeData} from 'vs/editor/common/modes/supports/tokenizationSupport'; import {IThreadService} from 'vs/platform/thread/common/thread'; diff --git a/src/vs/languages/html/common/html.ts b/src/vs/languages/html/common/html.ts index 3c2d781b603..383ca32bb41 100644 --- a/src/vs/languages/html/common/html.ts +++ b/src/vs/languages/html/common/html.ts @@ -16,7 +16,7 @@ import {IModeService} from 'vs/editor/common/services/modeService'; import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation'; import * as htmlTokenTypes from 'vs/languages/html/common/htmlTokenTypes'; import {EMPTY_ELEMENTS} from 'vs/languages/html/common/htmlEmptyTagsShared'; -import {RichEditSupport} from 'vs/editor/common/modes/supports/richEditSupport'; +import {RichEditSupport} from 'vs/editor/common/modes/languageConfigurationRegistry'; import {TokenizationSupport, IEnteringNestedModeData, ILeavingNestedModeData, ITokenizationCustomization} from 'vs/editor/common/modes/supports/tokenizationSupport'; import {IThreadService} from 'vs/platform/thread/common/thread'; import {wireCancellationToken} from 'vs/base/common/async'; diff --git a/src/vs/languages/html/test/common/html.test.ts b/src/vs/languages/html/test/common/html.test.ts index 1b4dba831f1..e1f71a088b7 100644 --- a/src/vs/languages/html/test/common/html.test.ts +++ b/src/vs/languages/html/test/common/html.test.ts @@ -23,7 +23,7 @@ import {InstantiationService} from 'vs/platform/instantiation/common/instantiati import {HTMLMode} from 'vs/languages/html/common/html'; import htmlWorker = require('vs/languages/html/common/htmlWorker'); import {MockTokenizingMode} from 'vs/editor/test/common/mocks/mockMode'; -import {RichEditSupport} from 'vs/editor/common/modes/supports/richEditSupport'; +import {RichEditSupport} from 'vs/editor/common/modes/languageConfigurationRegistry'; class MockJSMode extends MockTokenizingMode { diff --git a/src/vs/languages/json/common/json.ts b/src/vs/languages/json/common/json.ts index 37b23c75a22..3fe39c41200 100644 --- a/src/vs/languages/json/common/json.ts +++ b/src/vs/languages/json/common/json.ts @@ -16,7 +16,7 @@ import {OneWorkerAttr, AllWorkersAttr} from 'vs/platform/thread/common/threadSer import {IThreadService, ThreadAffinity} from 'vs/platform/thread/common/thread'; import {IJSONContributionRegistry, Extensions, ISchemaContributions} from 'vs/platform/jsonschemas/common/jsonContributionRegistry'; import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation'; -import {RichEditSupport} from 'vs/editor/common/modes/supports/richEditSupport'; +import {RichEditSupport} from 'vs/editor/common/modes/languageConfigurationRegistry'; import {wireCancellationToken} from 'vs/base/common/async'; export class JSONMode extends AbstractMode { diff --git a/src/vs/languages/less/common/less.ts b/src/vs/languages/less/common/less.ts index 4435ba7b1b7..348bc0c8f60 100644 --- a/src/vs/languages/less/common/less.ts +++ b/src/vs/languages/less/common/less.ts @@ -21,7 +21,7 @@ import {IModelService} from 'vs/editor/common/services/modelService'; import {IEditorWorkerService} from 'vs/editor/common/services/editorWorkerService'; import {wireCancellationToken} from 'vs/base/common/async'; import {createTokenizationSupport} from 'vs/editor/common/modes/monarch/monarchLexer'; -import {RichEditSupport} from 'vs/editor/common/modes/supports/richEditSupport'; +import {RichEditSupport} from 'vs/editor/common/modes/languageConfigurationRegistry'; export var language: Types.ILanguage = { defaultToken: '', diff --git a/src/vs/languages/markdown/common/markdown.ts b/src/vs/languages/markdown/common/markdown.ts index f36947a037f..24d13708d02 100644 --- a/src/vs/languages/markdown/common/markdown.ts +++ b/src/vs/languages/markdown/common/markdown.ts @@ -20,7 +20,7 @@ import {IConfigurationService} from 'vs/platform/configuration/common/configurat import {IEditorWorkerService} from 'vs/editor/common/services/editorWorkerService'; import {AbstractMode, ModeWorkerManager} from 'vs/editor/common/modes/abstractMode'; import {createTokenizationSupport} from 'vs/editor/common/modes/monarch/monarchLexer'; -import {RichEditSupport} from 'vs/editor/common/modes/supports/richEditSupport'; +import {RichEditSupport} from 'vs/editor/common/modes/languageConfigurationRegistry'; import {wireCancellationToken} from 'vs/base/common/async'; export const language = diff --git a/src/vs/languages/php/common/php.ts b/src/vs/languages/php/common/php.ts index e55ac7c64d6..c8641aafe66 100644 --- a/src/vs/languages/php/common/php.ts +++ b/src/vs/languages/php/common/php.ts @@ -10,7 +10,7 @@ import Modes = require('vs/editor/common/modes'); import {AbstractMode, isDigit, createWordRegExp} from 'vs/editor/common/modes/abstractMode'; import {AbstractState} from 'vs/editor/common/modes/abstractState'; import {IModeService} from 'vs/editor/common/services/modeService'; -import {RichEditSupport} from 'vs/editor/common/modes/supports/richEditSupport'; +import {RichEditSupport} from 'vs/editor/common/modes/languageConfigurationRegistry'; import {TokenizationSupport, ILeavingNestedModeData, ITokenizationCustomization} from 'vs/editor/common/modes/supports/tokenizationSupport'; import {TextualSuggestSupport} from 'vs/editor/common/modes/supports/suggestSupport'; import {IEditorWorkerService} from 'vs/editor/common/services/editorWorkerService'; diff --git a/src/vs/languages/razor/common/razor.ts b/src/vs/languages/razor/common/razor.ts index 6c9858e627a..cb6b9741b6e 100644 --- a/src/vs/languages/razor/common/razor.ts +++ b/src/vs/languages/razor/common/razor.ts @@ -12,7 +12,7 @@ import razorTokenTypes = require('vs/languages/razor/common/razorTokenTypes'); import {RAZORWorker} from 'vs/languages/razor/common/razorWorker'; import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation'; import {IModeService} from 'vs/editor/common/services/modeService'; -import {RichEditSupport} from 'vs/editor/common/modes/supports/richEditSupport'; +import {RichEditSupport} from 'vs/editor/common/modes/languageConfigurationRegistry'; import {ILeavingNestedModeData} from 'vs/editor/common/modes/supports/tokenizationSupport'; import {IThreadService} from 'vs/platform/thread/common/thread'; import {wireCancellationToken} from 'vs/base/common/async'; diff --git a/src/vs/languages/sass/common/sass.ts b/src/vs/languages/sass/common/sass.ts index 187b0531744..ca5cde2bde3 100644 --- a/src/vs/languages/sass/common/sass.ts +++ b/src/vs/languages/sass/common/sass.ts @@ -21,7 +21,7 @@ import {IModelService} from 'vs/editor/common/services/modelService'; import {IEditorWorkerService} from 'vs/editor/common/services/editorWorkerService'; import {wireCancellationToken} from 'vs/base/common/async'; import {createTokenizationSupport} from 'vs/editor/common/modes/monarch/monarchLexer'; -import {RichEditSupport} from 'vs/editor/common/modes/supports/richEditSupport'; +import {RichEditSupport} from 'vs/editor/common/modes/languageConfigurationRegistry'; export var language = { defaultToken: '', diff --git a/src/vs/languages/typescript/common/mode.ts b/src/vs/languages/typescript/common/mode.ts index c423f814d68..b792db17d32 100644 --- a/src/vs/languages/typescript/common/mode.ts +++ b/src/vs/languages/typescript/common/mode.ts @@ -8,7 +8,7 @@ import * as modes from 'vs/editor/common/modes'; import * as lifecycle from 'vs/base/common/lifecycle'; import {createTokenizationSupport2, Language} from 'vs/languages/typescript/common/tokenization'; import {createWordRegExp} from 'vs/editor/common/modes/abstractMode'; -import {RichEditSupport, IRichLanguageConfiguration} from 'vs/editor/common/modes/supports/richEditSupport'; +import {RichEditSupport, IRichLanguageConfiguration} from 'vs/editor/common/modes/languageConfigurationRegistry'; import {IModelService} from 'vs/editor/common/services/modelService'; import {IModeService} from 'vs/editor/common/services/modeService'; import {IMarkerService} from 'vs/platform/markers/common/markers'; diff --git a/src/vs/workbench/parts/output/common/outputMode.ts b/src/vs/workbench/parts/output/common/outputMode.ts index 4e502c5081d..d609a8b62bf 100644 --- a/src/vs/workbench/parts/output/common/outputMode.ts +++ b/src/vs/workbench/parts/output/common/outputMode.ts @@ -18,7 +18,7 @@ import * as modes from 'vs/editor/common/modes'; import {IEditorWorkerService} from 'vs/editor/common/services/editorWorkerService'; import {AbstractMode, ModeWorkerManager} from 'vs/editor/common/modes/abstractMode'; import {createTokenizationSupport} from 'vs/editor/common/modes/monarch/monarchLexer'; -import {RichEditSupport} from 'vs/editor/common/modes/supports/richEditSupport'; +import {RichEditSupport} from 'vs/editor/common/modes/languageConfigurationRegistry'; import {wireCancellationToken} from 'vs/base/common/async'; export const language: types.ILanguage = { -- GitLab