@theia/api-tests 1.65.0-next.19 → 1.65.0-next.28

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@theia/api-tests",
-  "version": "1.65.0-next.19+b89f0f8d7",
+  "version": "1.65.0-next.28+7c6aec352",
   "description": "Theia API tests",
   "dependencies": {
-    "@theia/core": "1.65.0-next.19+b89f0f8d7"
+    "@theia/core": "1.65.0-next.28+7c6aec352"
   },
   "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0",
   "repository": {
@@ -20,5 +20,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b89f0f8d7b76879e9f0e26186967154be931b149"
+  "gitHead": "7c6aec3525bb27b346e55cd46899d6b82145f6bd"
 }

package/src/launch-preferences.spec.js

@@ -30,12 +30,13 @@ describe('Launch Preferences', function () {
 
     const { assert } = chai;
 
-    const { PreferenceProvider } = require('@theia/core/lib/browser');
-    const { PreferenceService, PreferenceScope } = require('@theia/core/lib/browser/preferences/preference-service');
+    const { PreferenceProvider } = require('@theia/core/lib/common');
+    const { PreferenceService } = require('@theia/core/lib/common/preferences/preference-service');
+    const { PreferenceScope } = require('@theia/core/lib/common/preferences/preference-scope');
     const { WorkspaceService } = require('@theia/workspace/lib/browser/workspace-service');
     const { FileService } = require('@theia/filesystem/lib/browser/file-service');
     const { FileResourceResolver } = require('@theia/filesystem/lib/browser/file-resource');
-    const { AbstractResourcePreferenceProvider } = require('@theia/preferences/lib/browser/abstract-resource-preference-provider');
+    const { AbstractResourcePreferenceProvider } = require('@theia/preferences/lib/common/abstract-resource-preference-provider');
     const { waitForEvent } = require('@theia/core/lib/common/promise-util');
 
     const container = window.theia.container;

package/src/preferences.spec.js

@@ -19,27 +19,29 @@
 describe('Preferences', function () {
     this.timeout(5_000);
     const { assert } = chai;
-    const { PreferenceProvider } = require('@theia/core/lib/browser/preferences/preference-provider');
-    const { PreferenceService, PreferenceScope } = require('@theia/core/lib/browser/preferences/preference-service');
+    const { PreferenceProvider } = require('@theia/core/lib/common/preferences/preference-provider');
+    const { PreferenceService, PreferenceScope } = require('@theia/core/lib/common/preferences');
     const { FileService } = require('@theia/filesystem/lib/browser/file-service');
-    const { PreferenceLanguageOverrideService } = require('@theia/core/lib/browser/preferences/preference-language-override-service');
+    const { PreferenceLanguageOverrideService } = require('@theia/core/lib/common/preferences/preference-language-override-service');
     const { MonacoTextModelService } = require('@theia/monaco/lib/browser/monaco-text-model-service');
-    const { PreferenceSchemaProvider } = require('@theia/core/lib/browser/preferences/preference-contribution')
+    const { PreferenceSchemaService } = require('@theia/core/lib/common/preferences')
     const { container } = window.theia;
-    /** @type {import ('@theia/core/lib/browser/preferences/preference-service').PreferenceService} */
+    /** @type {import ('@theia/core/lib/common/preferences/preference-service').PreferenceService} */
     const preferenceService = container.get(PreferenceService);
-    /** @type {import ('@theia/core/lib/browser/preferences/preference-language-override-service').PreferenceLanguageOverrideService} */
+    /** @type {import ('@theia/core/lib/common/preferences/preference-language-override-service').PreferenceLanguageOverrideService} */
     const overrideService = container.get(PreferenceLanguageOverrideService);
     const fileService = container.get(FileService);
     /** @type {import ('@theia/core/lib/common/uri').default} */
     const uri = preferenceService.getConfigUri(PreferenceScope.Workspace);
     /** @type {import('@theia/preferences/lib/browser/folders-preferences-provider').FoldersPreferencesProvider} */
     const folderPreferences = container.getNamed(PreferenceProvider, PreferenceScope.Folder);
-    /** @type PreferenceSchemaProvider */
-    const schemaProvider = container.get(PreferenceSchemaProvider);
+    /** @type PreferenceSchemaService */
+    const schemaService = container.get(PreferenceSchemaService);
     const modelService = container.get(MonacoTextModelService);
 
+
     const overrideIdentifier = 'bargle-noddle-zaus'; // Probably not in our preference files...
+    schemaService.registerOverrideIdentifier(overrideIdentifier);
     const tabSize = 'editor.tabSize';
     const fontSize = 'editor.fontSize';
     const override = overrideService.markLanguageOverride(overrideIdentifier);
@@ -91,7 +93,7 @@ describe('Preferences', function () {
         assert.isDefined(uri, 'The workspace config URI should be defined!');
         fileExistsBeforehand = await fileService.exists(uri);
         contentBeforehand = await fileService.read(uri).then(({ value }) => value).catch(() => '');
-        schemaProvider.registerOverrideIdentifier(overrideIdentifier);
+        schemaService.registerOverrideIdentifier(overrideIdentifier);
         await deleteAllValues();
     });
 

package/src/saveable.spec.js

@@ -22,7 +22,7 @@ describe('Saveable', function () {
 
     const { EditorManager } = require('@theia/editor/lib/browser/editor-manager');
     const { EditorWidget } = require('@theia/editor/lib/browser/editor-widget');
-    const { PreferenceService } = require('@theia/core/lib/browser/preferences/preference-service');
+    const { PreferenceService } = require('@theia/core/lib/common/preferences/preference-service');
     const { Saveable, SaveableWidget } = require('@theia/core/lib/browser/saveable');
     const { WorkspaceService } = require('@theia/workspace/lib/browser/workspace-service');
     const { FileService } = require('@theia/filesystem/lib/browser/file-service');
@@ -38,7 +38,7 @@ describe('Saveable', function () {
     const editorManager = container.get(EditorManager);
     const workspaceService = container.get(WorkspaceService);
     const fileService = container.get(FileService);
-    /** @type {import('@theia/core/lib/browser/preferences/preference-service').PreferenceService} */
+    /** @type {import('@theia/core/lib/common/preferences/preference-service').PreferenceService} */
     const preferences = container.get(PreferenceService);
 
     /** @type {EditorWidget & SaveableWidget} */