replace json theia extension with vscode one

.travis.yml

@@ -28,7 +28,6 @@ cache:
     - packages/filesystem/node_modules
     - packages/getting-started/node_modules
     - packages/git/node_modules
-    - packages/json/node_modules
     - packages/keymaps/node_modules
     - packages/languages/node_modules
     - packages/markers/node_modules

CHANGELOG.md

@@ -4,6 +4,19 @@
 
 - [core] fixed handling of environment variables on Windows [#7973](https://github.com/eclipse-theia/theia/pull/7973)
 
+Breaking Changes:
+
+<a name="1_4_0_replace_json"></a>
+- [[json]](#1_4_0_replace_json) replaced `@theia/json` Theia extension with `vscode.json-language-features` VS Code extension [#8112](https://github.com/eclipse-theia/theia/pull/8112)
+  - You can register JSON validations at application startup by implementing `JsonSchemaContribution` Theia contribution point.
+  - Alternatively you can provide JSON validations using VS Code [contributes.jsonValidation](https://code.visualstudio.com/api/references/contribution-points#contributes.jsonValidation) contribution point.
+<a name="1_4_0_absolute_user_storage_uri"></a>
+- [[user-storage]](#1_4_0_absolute_user_storage_uri) settings URI must be an absolute to satisfy expectations of `vscode.json-language-features` [#8112](https://github.com/eclipse-theia/theia/pull/8112)
+  - If you imlpement a custom user storage make sure to check old relaitve locations, otherwise it can cause user data loss.
+<a name="1_4_0_deprecate_languages"></a>
+- [[languages]](#1_4_0_deprecate_languages) `@theia/languages` extension is deprecated, use VS Code extensions to provide language smartness: 
+  https://code.visualstudio.com/api/language-extensions/language-server-extension-guide [#8112](https://github.com/eclipse-theia/theia/pull/8112)
+
 ## v1.3.0
 
 - [cli] updated the download script to warn about mandatory `theiaPlugins` field [#8058](https://github.com/eclipse-theia/theia/pull/8058)

configs/root-compilation.tsconfig.json

@@ -46,9 +46,6 @@
     {
       "path": "../packages/git/compile.tsconfig.json"
     },
-    {
-      "path": "../packages/json/compile.tsconfig.json"
-    },
     {
       "path": "../packages/keymaps/compile.tsconfig.json"
     },

examples/browser/package.json

@@ -25,7 +25,6 @@
     "@theia/filesystem": "^1.3.0",
     "@theia/getting-started": "^1.3.0",
     "@theia/git": "^1.3.0",
-    "@theia/json": "^1.3.0",
     "@theia/keymaps": "^1.3.0",
     "@theia/languages": "^1.3.0",
     "@theia/markers": "^1.3.0",
@@ -70,4 +69,4 @@
   "devDependencies": {
     "@theia/cli": "^1.3.0"
   }
-}
+}

examples/electron/compile.tsconfig.json

@@ -44,9 +44,6 @@
     {
       "path": "../../packages/git/compile.tsconfig.json"
     },
-    {
-      "path": "../../packages/json/compile.tsconfig.json"
-    },
     {
       "path": "../../packages/keymaps/compile.tsconfig.json"
     },

examples/electron/package.json

@@ -25,7 +25,6 @@
     "@theia/filesystem": "^1.3.0",
     "@theia/getting-started": "^1.3.0",
     "@theia/git": "^1.3.0",
-    "@theia/json": "^1.3.0",
     "@theia/keymaps": "^1.3.0",
     "@theia/languages": "^1.3.0",
     "@theia/markers": "^1.3.0",
@@ -66,4 +65,4 @@
   "devDependencies": {
     "@theia/cli": "^1.3.0"
   }
-}
+}

package.json

@@ -104,7 +104,8 @@
     "vscode-builtin-jake": "https://open-vsx.org/api/vscode/jake/1.44.2/file/vscode.jake-1.44.2.vsix",
     "vscode-builtin-java": "https://open-vsx.org/api/vscode/java/1.44.2/file/vscode.java-1.44.2.vsix",
     "vscode-builtin-javascript": "https://open-vsx.org/api/vscode/javascript/1.44.2/file/vscode.javascript-1.44.2.vsix",
-    "vscode-builtin-json": "https://open-vsx.org/api/vscode/json/1.44.2/file/vscode.json-1.44.2.vsix",
+    "vscode-builtin-json": "https://open-vsx.org/api/vscode/json/1.46.1/file/vscode.json-1.46.1.vsix",
+    "vscode-builtin-json-language-features": "https://open-vsx.org/api/vscode/json-language-features/1.46.1/file/vscode.json-language-features-1.46.1.vsix",
     "vscode-builtin-less": "https://open-vsx.org/api/vscode/less/1.44.2/file/vscode.less-1.44.2.vsix",
     "vscode-builtin-log": "https://open-vsx.org/api/vscode/log/1.44.2/file/vscode.log-1.44.2.vsix",
     "vscode-builtin-lua": "https://open-vsx.org/api/vscode/lua/1.44.2/file/vscode.lua-1.44.2.vsix",

packages/core/src/browser/frontend-application-module.ts

@@ -61,7 +61,7 @@ import { WebSocketConnectionProvider } from './messaging';
 import { AboutDialog, AboutDialogProps } from './about-dialog';
 import { EnvVariablesServer, envVariablesPath, EnvVariable } from './../common/env-variables';
 import { FrontendApplicationStateService } from './frontend-application-state';
-import { JsonSchemaStore } from './json-schema-store';
+import { JsonSchemaStore, JsonSchemaContribution, DefaultJsonSchemaContribution } from './json-schema-store';
 import { TabBarToolbarRegistry, TabBarToolbarContribution, TabBarToolbarFactory, TabBarToolbar } from './shell/tab-bar-toolbar';
 import { bindCorePreferences } from './core-preferences';
 import { QuickPickServiceImpl } from './quick-open/quick-pick-service-impl';
@@ -257,7 +257,11 @@ export const frontendApplicationModule = new ContainerModule((bind, unbind, isBo
     bindPreferenceService(bind);
     bind(FrontendApplicationContribution).toService(PreferenceService);
 
+    bindContributionProvider(bind, JsonSchemaContribution);
     bind(JsonSchemaStore).toSelf().inSingletonScope();
+    bind(FrontendApplicationContribution).toService(JsonSchemaStore);
+    bind(DefaultJsonSchemaContribution).toSelf().inSingletonScope();
+    bind(JsonSchemaContribution).toService(DefaultJsonSchemaContribution);
 
     bind(PingService).toDynamicValue(ctx => {
         // let's reuse a simple and cheap service from this package

packages/core/src/browser/json-schema-store.ts

@@ -14,65 +14,110 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import debounce = require('lodash.debounce');
-
-import { injectable, inject } from 'inversify';
-import { InMemoryResources } from '../common/resource';
-import { Disposable, DisposableCollection } from '../common/disposable';
-import { Emitter } from '../common/event';
-import URI from '../common/uri';
+import { injectable, inject, named } from 'inversify';
+import { ContributionProvider } from '../common/contribution-provider';
+import { FrontendApplicationContribution } from './frontend-application';
+import { MaybePromise } from '../common';
+import { Endpoint } from './endpoint';
+import { timeout, Deferred } from '../common/promise-util';
 
 export interface JsonSchemaConfiguration {
-    url: string
-    fileMatch: string[]
+    fileMatch: string | string[];
+    url: string;
 }
 
-@injectable()
-export class JsonSchemaStore {
-
-    @inject(InMemoryResources)
-    protected readonly inMemoryResources: InMemoryResources;
+export interface JsonSchemaRegisterContext {
+    registerSchema(config: JsonSchemaConfiguration): void;
+}
 
-    private readonly schemas: JsonSchemaConfiguration[] = [];
+export const JsonSchemaContribution = Symbol('JsonSchemaContribution');
+export interface JsonSchemaContribution {
+    registerSchemas(store: JsonSchemaRegisterContext): MaybePromise<void>
+}
 
-    protected readonly onSchemasChangedEmitter = new Emitter<void>();
-    readonly onSchemasChanged = this.onSchemasChangedEmitter.event;
+@injectable()
+export class JsonSchemaStore implements FrontendApplicationContribution {
 
-    protected readonly onDidChangeSchemaEmitter = new Emitter<URI>();
-    readonly onDidChangeSchema = this.onDidChangeSchemaEmitter.event;
+    @inject(ContributionProvider) @named(JsonSchemaContribution)
+    protected readonly contributions: ContributionProvider<JsonSchemaContribution>;
 
-    protected notifyChanged = debounce(() => {
-        this.onSchemasChangedEmitter.fire(undefined);
-    }, 500);
+    protected readonly _schemas = new Deferred<JsonSchemaConfiguration[]>();
+    get schemas(): Promise<JsonSchemaConfiguration[]> {
+        return this._schemas.promise;
+    }
 
-    registerSchema(config: JsonSchemaConfiguration): Disposable {
-        const toDispose = new DisposableCollection();
-        const uri = new URI(config.url);
-        if (uri.scheme === 'vscode') {
-            const resource = this.inMemoryResources.resolve(new URI(config.url));
-            if (resource && resource.onDidChangeContents) {
-                toDispose.push(resource.onDidChangeContents(() => {
-                    this.onDidChangeSchemaEmitter.fire(uri);
-                    this.notifyChanged();
+    onStart(): void {
+        const pendingRegistrations = [];
+        const schemas: JsonSchemaConfiguration[] = [];
+        const freeze = () => {
+            Object.freeze(schemas);
+            this._schemas.resolve(schemas);
+        };
+        const registerTimeout = this.getRegisterTimeout();
+        const frozenErrorCode = 'JsonSchemaRegisterContext.frozen';
+        const context: JsonSchemaRegisterContext = {
+            registerSchema: schema => {
+                if (Object.isFrozen(schemas)) {
+                    throw new Error(frozenErrorCode);
+                }
+                schemas.push(schema);
+            }
+        };
+        for (const contribution of this.contributions.getContributions()) {
+            const result = contribution.registerSchemas(context);
+            if (result) {
+                pendingRegistrations.push(result.then(() => { }, e => {
+                    if (e instanceof Error && e.message === frozenErrorCode) {
+                        console.error(`${contribution.constructor.name}.registerSchemas is taking more than ${registerTimeout.toFixed(1)} ms, new schemas are ignored.`);
+                    } else {
+                        console.error(e);
+                    }
                 }));
             }
         }
-        this.schemas.push(config);
-        toDispose.push(Disposable.create(() => {
-            const idx = this.schemas.indexOf(config);
-            if (idx > -1) {
-                this.schemas.splice(idx, 1);
-                this.onDidChangeSchemaEmitter.fire(uri);
-                this.notifyChanged();
+        if (pendingRegistrations.length) {
+            let pending = Promise.all(pendingRegistrations).then(() => { });
+            if (registerTimeout) {
+                pending = Promise.race([pending, timeout(registerTimeout)]);
             }
-        }));
-        this.onDidChangeSchemaEmitter.fire(uri);
-        this.notifyChanged();
-        return toDispose;
+            pending.then(freeze);
+        } else {
+            freeze();
+        }
+    }
+
+    protected getRegisterTimeout(): number {
+        return 500;
     }
 
-    getJsonSchemaConfigurations(): JsonSchemaConfiguration[] {
-        return [...this.schemas];
+}
+
+@injectable()
+export class DefaultJsonSchemaContribution implements JsonSchemaContribution {
+
+    async registerSchemas(context: JsonSchemaRegisterContext): Promise<void> {
+        const url = `${new Endpoint().httpScheme}//schemastore.azurewebsites.net/api/json/catalog.json`;
+        const response = await fetch(url);
+        const schemas: DefaultJsonSchemaContribution.SchemaData[] = (await response.json()).schemas!;
+        for (const s of schemas) {
+            if (s.fileMatch) {
+                context.registerSchema({
+                    fileMatch: s.fileMatch,
+                    url: s.url
+                });
+            }
+        }
     }
 
 }
+export namespace DefaultJsonSchemaContribution {
+    export interface SchemaData {
+        name: string;
+        description: string;
+        fileMatch?: string[];
+        url: string;
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        schema: any;
+    }
+}
+

packages/core/src/common/resource.ts

@@ -194,7 +194,7 @@ export class MutableResource implements Resource {
 @injectable()
 export class InMemoryResources implements ResourceResolver {
 
-    private resources = new Map<string, MutableResource>();
+    private readonly resources = new Map<string, MutableResource>();
 
     add(uri: URI, contents: string): Resource {
         const resourceUri = uri.toString();

packages/debug/src/browser/debug-frontend-module.ts

@@ -56,6 +56,7 @@ import { DebugWatchManager } from './debug-watch-manager';
 import { MonacoEditorService } from '@theia/monaco/lib/browser/monaco-editor-service';
 import { DebugBreakpointWidget } from './editor/debug-breakpoint-widget';
 import { DebugInlineValueDecorator } from './editor/debug-inline-value-decorator';
+import { JsonSchemaContribution } from '@theia/core/lib/browser/json-schema-store';
 
 export default new ContainerModule((bind: interfaces.Bind) => {
     bind(DebugCallStackItemTypeKey).toDynamicValue(({ container }) =>
@@ -85,6 +86,7 @@ export default new ContainerModule((bind: interfaces.Bind) => {
     DebugConsoleContribution.bindContribution(bind);
 
     bind(DebugSchemaUpdater).toSelf().inSingletonScope();
+    bind(JsonSchemaContribution).toService(DebugSchemaUpdater);
     bind(DebugConfigurationManager).toSelf().inSingletonScope();
 
     bind(DebugInlineValueDecorator).toSelf().inSingletonScope();

packages/debug/src/browser/debug-schema-updater.ts

@@ -15,7 +15,7 @@
  ********************************************************************************/
 
 import { injectable, inject } from 'inversify';
-import { JsonSchemaStore } from '@theia/core/lib/browser/json-schema-store';
+import { JsonSchemaRegisterContext, JsonSchemaContribution } from '@theia/core/lib/browser/json-schema-store';
 import { InMemoryResources, deepClone } from '@theia/core/lib/common';
 import { IJSONSchema } from '@theia/core/lib/common/json-schema';
 import URI from '@theia/core/lib/common/uri';
@@ -24,12 +24,21 @@ import { debugPreferencesSchema } from './debug-preferences';
 import { inputsSchema } from '@theia/variable-resolver/lib/browser/variable-input-schema';
 
 @injectable()
-export class DebugSchemaUpdater {
+export class DebugSchemaUpdater implements JsonSchemaContribution {
+
+    protected readonly uri = new URI(launchSchemaId);
 
-    @inject(JsonSchemaStore) protected readonly jsonSchemaStore: JsonSchemaStore;
     @inject(InMemoryResources) protected readonly inmemoryResources: InMemoryResources;
     @inject(DebugService) protected readonly debug: DebugService;
 
+    registerSchemas(context: JsonSchemaRegisterContext): void {
+        this.inmemoryResources.add(this.uri, '');
+        context.registerSchema({
+            fileMatch: ['launch.json'],
+            url: this.uri.toString()
+        });
+    }
+
     async update(): Promise<void> {
         const types = await this.debug.debugTypes();
         const schema = { ...deepClone(launchSchema) };
@@ -48,17 +57,8 @@ export class DebugSchemaUpdater {
         }
         items.defaultSnippets!.push(...await this.debug.getConfigurationSnippets());
 
-        const uri = new URI(launchSchemaId);
         const contents = JSON.stringify(schema);
-        try {
-            this.inmemoryResources.update(uri, contents);
-        } catch (e) {
-            this.inmemoryResources.add(uri, contents);
-            this.jsonSchemaStore.registerSchema({
-                fileMatch: ['launch.json'],
-                url: uri.toString()
-            });
-        }
+        this.inmemoryResources.update(this.uri, contents);
     }
 }