Skip to content

Commit

Permalink
[json] remove dependencies to @theia/json
Browse files Browse the repository at this point in the history
Fixes eclipse-theia#4217

Removes dependencies to `@theia/json` from both the
`@theia/preferences` and `@theia/debug` extensions so that
we can use vscode builtin extensions instead.

Signed-off-by: Anatoliy Bazko <abazko@redhat.com>
  • Loading branch information
tolusha authored and Sean Hellum committed Mar 12, 2020
1 parent c9aae77 commit 2793e9d
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 4 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ Breaking changes:
`webpack.config.js` is generated only once. It can be edited by users to custoimze bundling,
but should be based on `gen-webpack.config.js` to pick any changes in the generated config.
If it does not have a reference to `gen-webpack.config.js` then it will be regenerated.
- [debug] removed `@theia/json` dependency. Applications should explicitly depend on `@theia/json` instead [#6647](https://github.com/eclipse-theia/theia/pull/6647)
- [preferences] removed `@theia/json` dependency. Applications should explicitly depend on `@theia/json` instead [#6647](https://github.com/eclipse-theia/theia/pull/6647)

## v0.14.0

Expand Down
1 change: 0 additions & 1 deletion packages/debug/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
"@theia/core": "^0.14.0",
"@theia/editor": "^0.14.0",
"@theia/filesystem": "^0.14.0",
"@theia/json": "^0.14.0",
"@theia/languages": "^0.14.0",
"@theia/markers": "^0.14.0",
"@theia/monaco": "^0.14.0",
Expand Down
1 change: 0 additions & 1 deletion packages/preferences/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
"@theia/core": "^0.14.0",
"@theia/editor": "^0.14.0",
"@theia/filesystem": "^0.14.0",
"@theia/json": "^0.14.0",
"@theia/monaco": "^0.14.0",
"@theia/userstorage": "^0.14.0",
"@theia/workspace": "^0.14.0",
Expand Down
3 changes: 1 addition & 2 deletions packages/preferences/src/browser/preferences-tree-widget.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 2793e9d

Please sign in to comment.