@@ -12,12 +12,12 @@ import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cance
1212import { IStringDictionary } from 'vs/base/common/collections' ;
1313import { getErrorMessage , isPromiseCanceledError , onUnexpectedError } from 'vs/base/common/errors' ;
1414import { Emitter , Event } from 'vs/base/common/event' ;
15- import { ArrayNavigator } from 'vs/base/common/navigator' ;
1615import { Disposable , dispose , IDisposable } from 'vs/base/common/lifecycle' ;
17- import * as strings from 'vs/base/common/strings' ;
16+ import { ArrayNavigator } from 'vs/base/common/navigator' ;
17+ import { assertIsDefined , withNullAsUndefined , withUndefinedAsNull } from 'vs/base/common/types' ;
1818import { URI } from 'vs/base/common/uri' ;
1919import { ICodeEditor } from 'vs/editor/browser/editorBrowser' ;
20- import { EditorExtensionsRegistry , registerEditorContribution , IEditorContributionDescription } from 'vs/editor/browser/editorExtensions' ;
20+ import { EditorExtensionsRegistry , IEditorContributionDescription , registerEditorContribution } from 'vs/editor/browser/editorExtensions' ;
2121import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditorWidget' ;
2222import { IEditorOptions } from 'vs/editor/common/config/editorOptions' ;
2323import * as editorCommon from 'vs/editor/common/editorCommon' ;
@@ -29,7 +29,7 @@ import { SelectionHighlighter } from 'vs/editor/contrib/multicursor/multicursor'
2929import * as nls from 'vs/nls' ;
3030import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration' ;
3131import { IContextKey , IContextKeyService } from 'vs/platform/contextkey/common/contextkey' ;
32- import { IInstantiationService , IConstructorSignature1 } from 'vs/platform/instantiation/common/instantiation' ;
32+ import { IConstructorSignature1 , IInstantiationService } from 'vs/platform/instantiation/common/instantiation' ;
3333import { ILogService } from 'vs/platform/log/common/log' ;
3434import { IEditorProgressService } from 'vs/platform/progress/common/progress' ;
3535import { Registry } from 'vs/platform/registry/common/platform' ;
@@ -46,13 +46,12 @@ import { EditorInput, EditorOptions, IEditorControl } from 'vs/workbench/common/
4646import { ResourceEditorModel } from 'vs/workbench/common/editor/resourceEditorModel' ;
4747import { DefaultSettingsRenderer , FolderSettingsRenderer , IPreferencesRenderer , UserSettingsRenderer , WorkspaceSettingsRenderer } from 'vs/workbench/contrib/preferences/browser/preferencesRenderers' ;
4848import { SearchWidget , SettingsTarget , SettingsTargetsWidget } from 'vs/workbench/contrib/preferences/browser/preferencesWidgets' ;
49- import { CONTEXT_SETTINGS_EDITOR , CONTEXT_SETTINGS_SEARCH_FOCUS , IPreferencesSearchService , ISearchProvider , CONTEXT_SETTINGS_JSON_EDITOR } from 'vs/workbench/contrib/preferences/common/preferences' ;
50- import { IEditorService } from 'vs/workbench/services/editor/common/editorService' ;
49+ import { CONTEXT_SETTINGS_EDITOR , CONTEXT_SETTINGS_JSON_EDITOR , CONTEXT_SETTINGS_SEARCH_FOCUS , IPreferencesSearchService , ISearchProvider } from 'vs/workbench/contrib/preferences/common/preferences' ;
5150import { IEditorGroup , IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService' ;
51+ import { IEditorService } from 'vs/workbench/services/editor/common/editorService' ;
5252import { IFilterResult , IPreferencesService , ISetting , ISettingsEditorModel , ISettingsGroup , SettingsEditorOptions } from 'vs/workbench/services/preferences/common/preferences' ;
5353import { DefaultPreferencesEditorInput , PreferencesEditorInput } from 'vs/workbench/services/preferences/common/preferencesEditorInput' ;
5454import { DefaultSettingsEditorModel , SettingsEditorModel } from 'vs/workbench/services/preferences/common/preferencesModels' ;
55- import { withNullAsUndefined , withUndefinedAsNull , assertIsDefined } from 'vs/base/common/types' ;
5655
5756export class PreferencesEditor extends BaseEditor {
5857
0 commit comments