From 4eb8ad2d92c14a8c32ba22ed282e32788aebc163 Mon Sep 17 00:00:00 2001 From: Anatoliy Bazko Date: Wed, 27 Nov 2019 11:32:12 +0200 Subject: [PATCH] Do not depend on @theia/json Signed-off-by: Anatoliy Bazko --- packages/debug/package.json | 1 - packages/preferences/package.json | 1 - packages/preferences/src/browser/preferences-tree-widget.ts | 3 +-- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/debug/package.json b/packages/debug/package.json index 5b83371d48476..26ba35c45a2a5 100644 --- a/packages/debug/package.json +++ b/packages/debug/package.json @@ -8,7 +8,6 @@ "@theia/core": "^0.12.0", "@theia/editor": "^0.12.0", "@theia/filesystem": "^0.12.0", - "@theia/json": "^0.12.0", "@theia/languages": "^0.12.0", "@theia/markers": "^0.12.0", "@theia/monaco": "^0.12.0", diff --git a/packages/preferences/package.json b/packages/preferences/package.json index 46ffc6229d22a..1459cefc59625 100644 --- a/packages/preferences/package.json +++ b/packages/preferences/package.json @@ -6,7 +6,6 @@ "@theia/core": "^0.12.0", "@theia/editor": "^0.12.0", "@theia/filesystem": "^0.12.0", - "@theia/json": "^0.12.0", "@theia/monaco": "^0.12.0", "@theia/userstorage": "^0.12.0", "@theia/workspace": "^0.12.0", diff --git a/packages/preferences/src/browser/preferences-tree-widget.ts b/packages/preferences/src/browser/preferences-tree-widget.ts index 9ec56af79848f..649db1184478c 100644 --- a/packages/preferences/src/browser/preferences-tree-widget.ts +++ b/packages/preferences/src/browser/preferences-tree-widget.ts @@ -41,7 +41,6 @@ import { UserPreferenceProvider } from './user-preference-provider'; import { WorkspacePreferenceProvider } from './workspace-preference-provider'; import { PreferencesEditorWidget, PreferenceEditorContainerTabBarRenderer } from './preference-editor-widget'; import { EditorWidget, EditorManager } from '@theia/editor/lib/browser'; -import { JSONC_LANGUAGE_ID } from '@theia/json/lib/common'; import { DisposableCollection, Emitter, Event, MessageService } from '@theia/core'; import { Deferred } from '@theia/core/lib/common/promise-util'; import { FileSystem, FileSystemUtils } from '@theia/filesystem/lib/common'; @@ -346,7 +345,7 @@ export class PreferencesEditorsContainer extends DockPanel { workspacePreferences.title.label = 'Workspace'; workspacePreferences.title.caption = `Workspace Preferences: ${await this.getPreferenceEditorCaption(workspacePreferenceUri!)}`; workspacePreferences.title.iconClass = 'database-icon medium-yellow file-icon'; - workspacePreferences.editor.setLanguage(JSONC_LANGUAGE_ID); + workspacePreferences.editor.setLanguage('jsonc'); workspacePreferences.scope = PreferenceScope.Workspace; } return workspacePreferences;