diff --git a/src/vs/editor/common/languageFeatureRegistry.ts b/src/vs/editor/common/languageFeatureRegistry.ts index 9fb906b3520..8ab05410218 100644 --- a/src/vs/editor/common/languageFeatureRegistry.ts +++ b/src/vs/editor/common/languageFeatureRegistry.ts @@ -5,9 +5,8 @@ import { Emitter, Event } from 'vs/base/common/event'; import { IDisposable, toDisposable } from 'vs/base/common/lifecycle'; -import { ITextModel } from 'vs/editor/common/model'; -import { LanguageFilter, LanguageSelector, score } from 'vs/editor/common/languages/languageSelector'; -import { shouldSynchronizeModel } from 'vs/editor/common/services/model'; +import { ITextModel, shouldSynchronizeModel } from 'vs/editor/common/model'; +import { LanguageFilter, LanguageSelector, score } from 'vs/editor/common/languageSelector'; interface Entry { selector: LanguageSelector; diff --git a/src/vs/editor/common/languages/languageSelector.ts b/src/vs/editor/common/languageSelector.ts similarity index 98% rename from src/vs/editor/common/languages/languageSelector.ts rename to src/vs/editor/common/languageSelector.ts index 02826877fdc..0441b2dc59e 100644 --- a/src/vs/editor/common/languages/languageSelector.ts +++ b/src/vs/editor/common/languageSelector.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { IRelativePattern, match as matchGlobPattern } from 'vs/base/common/glob'; -import { URI } from 'vs/base/common/uri'; // TODO@Alex +import { URI } from 'vs/base/common/uri'; import { normalize } from 'vs/base/common/path'; export interface LanguageFilter { diff --git a/src/vs/editor/common/model.ts b/src/vs/editor/common/model.ts index cc881ae0623..dd397ceb990 100644 --- a/src/vs/editor/common/model.ts +++ b/src/vs/editor/common/model.ts @@ -1411,3 +1411,12 @@ export interface IInternalModelContentChange extends IModelContentChange { range: Range; forceMoveMarkers: boolean; } + +/** + * @internal + */ +export function shouldSynchronizeModel(model: ITextModel): boolean { + return ( + !model.isTooLargeForSyncing() && !model.isForSimpleWidget + ); +} diff --git a/src/vs/editor/common/services/model.ts b/src/vs/editor/common/services/model.ts index 8133aef3004..ff27b22d197 100644 --- a/src/vs/editor/common/services/model.ts +++ b/src/vs/editor/common/services/model.ts @@ -40,9 +40,3 @@ export interface IModelService { onModelLanguageChanged: Event<{ model: ITextModel; oldLanguageId: string; }>; } - -export function shouldSynchronizeModel(model: ITextModel): boolean { - return ( - !model.isTooLargeForSyncing() && !model.isForSimpleWidget - ); -} diff --git a/src/vs/editor/test/common/modes/languageSelector.test.ts b/src/vs/editor/test/common/modes/languageSelector.test.ts index 041a2ba3aea..1bbcd33884f 100644 --- a/src/vs/editor/test/common/modes/languageSelector.test.ts +++ b/src/vs/editor/test/common/modes/languageSelector.test.ts @@ -5,7 +5,7 @@ import * as assert from 'assert'; import { URI } from 'vs/base/common/uri'; -import { score } from 'vs/editor/common/languages/languageSelector'; +import { score } from 'vs/editor/common/languageSelector'; suite('LanguageSelector', function () { diff --git a/src/vs/workbench/api/browser/mainThreadDocuments.ts b/src/vs/workbench/api/browser/mainThreadDocuments.ts index ca679bece3c..cd81b164bf6 100644 --- a/src/vs/workbench/api/browser/mainThreadDocuments.ts +++ b/src/vs/workbench/api/browser/mainThreadDocuments.ts @@ -7,8 +7,8 @@ import { toErrorMessage } from 'vs/base/common/errorMessage'; import { IReference, dispose, Disposable } from 'vs/base/common/lifecycle'; import { Schemas } from 'vs/base/common/network'; import { URI, UriComponents } from 'vs/base/common/uri'; -import { ITextModel } from 'vs/editor/common/model'; -import { IModelService, shouldSynchronizeModel } from 'vs/editor/common/services/model'; +import { ITextModel, shouldSynchronizeModel } from 'vs/editor/common/model'; +import { IModelService } from 'vs/editor/common/services/model'; import { ITextModelService } from 'vs/editor/common/services/resolverService'; import { IFileService, FileOperation } from 'vs/platform/files/common/files'; import { MainThreadDocumentsAndEditors } from 'vs/workbench/api/browser/mainThreadDocumentsAndEditors'; diff --git a/src/vs/workbench/api/browser/mainThreadDocumentsAndEditors.ts b/src/vs/workbench/api/browser/mainThreadDocumentsAndEditors.ts index 6f6537ec2b3..4c61b61ba5d 100644 --- a/src/vs/workbench/api/browser/mainThreadDocumentsAndEditors.ts +++ b/src/vs/workbench/api/browser/mainThreadDocumentsAndEditors.ts @@ -10,8 +10,8 @@ import { ICodeEditor, isCodeEditor, isDiffEditor, IActiveCodeEditor } from 'vs/e import { IBulkEditService } from 'vs/editor/browser/services/bulkEditService'; import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService'; import { IEditor } from 'vs/editor/common/editorCommon'; -import { ITextModel } from 'vs/editor/common/model'; -import { IModelService, shouldSynchronizeModel } from 'vs/editor/common/services/model'; +import { ITextModel, shouldSynchronizeModel } from 'vs/editor/common/model'; +import { IModelService } from 'vs/editor/common/services/model'; import { ITextModelService } from 'vs/editor/common/services/resolverService'; import { IFileService } from 'vs/platform/files/common/files'; import { extHostCustomer } from 'vs/workbench/api/common/extHostCustomers'; diff --git a/src/vs/workbench/api/browser/mainThreadSaveParticipant.ts b/src/vs/workbench/api/browser/mainThreadSaveParticipant.ts index 2b27da5aa99..315805b9cb1 100644 --- a/src/vs/workbench/api/browser/mainThreadSaveParticipant.ts +++ b/src/vs/workbench/api/browser/mainThreadSaveParticipant.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { CancellationToken } from 'vs/base/common/cancellation'; -import { shouldSynchronizeModel } from 'vs/editor/common/services/model'; +import { shouldSynchronizeModel } from 'vs/editor/common/model'; import { localize } from 'vs/nls'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IProgressStep, IProgress } from 'vs/platform/progress/common/progress'; diff --git a/src/vs/workbench/api/common/extHost.api.impl.ts b/src/vs/workbench/api/common/extHost.api.impl.ts index e6a2ad1366d..4301f517114 100644 --- a/src/vs/workbench/api/common/extHost.api.impl.ts +++ b/src/vs/workbench/api/common/extHost.api.impl.ts @@ -11,7 +11,7 @@ import { URI } from 'vs/base/common/uri'; import { TextEditorCursorStyle } from 'vs/editor/common/config/editorOptions'; import { OverviewRulerLane } from 'vs/editor/common/model'; import * as languageConfiguration from 'vs/editor/common/languages/languageConfiguration'; -import { score } from 'vs/editor/common/languages/languageSelector'; +import { score } from 'vs/editor/common/languageSelector'; import * as files from 'vs/platform/files/common/files'; import { ExtHostContext, MainContext, UIKind, CandidatePortSource, ExtHostLogLevelServiceShape } from 'vs/workbench/api/common/extHost.protocol'; import { ExtHostApiCommands } from 'vs/workbench/api/common/extHostApiCommands'; diff --git a/src/vs/workbench/api/common/extHostNotebookConcatDocument.ts b/src/vs/workbench/api/common/extHostNotebookConcatDocument.ts index 7116bbd8d39..68e2df69964 100644 --- a/src/vs/workbench/api/common/extHostNotebookConcatDocument.ts +++ b/src/vs/workbench/api/common/extHostNotebookConcatDocument.ts @@ -10,7 +10,7 @@ import { ExtHostNotebookController } from 'vs/workbench/api/common/extHostNotebo import { ExtHostDocuments } from 'vs/workbench/api/common/extHostDocuments'; import { PrefixSumComputer } from 'vs/editor/common/model/prefixSumComputer'; import { DisposableStore } from 'vs/base/common/lifecycle'; -import { score } from 'vs/editor/common/languages/languageSelector'; +import { score } from 'vs/editor/common/languageSelector'; import { ResourceMap } from 'vs/base/common/map'; import { URI } from 'vs/base/common/uri'; import { generateUuid } from 'vs/base/common/uuid'; diff --git a/src/vs/workbench/api/common/extHostTypeConverters.ts b/src/vs/workbench/api/common/extHostTypeConverters.ts index f62f5c69bb8..6fb55ff9b3f 100644 --- a/src/vs/workbench/api/common/extHostTypeConverters.ts +++ b/src/vs/workbench/api/common/extHostTypeConverters.ts @@ -20,7 +20,7 @@ import { ISelection } from 'vs/editor/common/core/selection'; import { IContentDecorationRenderOptions, IDecorationOptions, IDecorationRenderOptions, IThemeDecorationRenderOptions } from 'vs/editor/common/editorCommon'; import { EndOfLineSequence, TrackedRangeStickiness } from 'vs/editor/common/model'; import * as modes from 'vs/editor/common/languages'; -import * as languageSelector from 'vs/editor/common/languages/languageSelector'; +import * as languageSelector from 'vs/editor/common/languageSelector'; import { EditorResolution, ITextEditorOptions } from 'vs/platform/editor/common/editor'; import { IMarkerData, IRelatedInformation, MarkerSeverity, MarkerTag } from 'vs/platform/markers/common/markers'; import { ProgressLocation as MainProgressLocation } from 'vs/platform/progress/common/progress'; diff --git a/src/vs/workbench/services/languageStatus/common/languageStatusService.ts b/src/vs/workbench/services/languageStatus/common/languageStatusService.ts index 717610a15a4..65763d269ab 100644 --- a/src/vs/workbench/services/languageStatus/common/languageStatusService.ts +++ b/src/vs/workbench/services/languageStatus/common/languageStatusService.ts @@ -11,7 +11,7 @@ import { compare } from 'vs/base/common/strings'; import { ITextModel } from 'vs/editor/common/model'; import { Command } from 'vs/editor/common/languages'; import { LanguageFeatureRegistry } from 'vs/editor/common/languageFeatureRegistry'; -import { LanguageSelector } from 'vs/editor/common/languages/languageSelector'; +import { LanguageSelector } from 'vs/editor/common/languageSelector'; import { IAccessibilityInformation } from 'vs/platform/accessibility/common/accessibility'; import { registerSingleton } from 'vs/platform/instantiation/common/extensions'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation';