@codingame/monaco-vscode-language-detection-worker-service-override 5.3.0 → 6.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-language-detection-worker-service-override",
-  "version": "5.3.0",
+  "version": "6.0.1",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -29,7 +29,7 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@5.3.0",
+    "vscode": "npm:@codingame/monaco-vscode-api@6.0.1",
     "@vscode/vscode-languagedetection": "npm:@codingame/vscode-languagedetection@1.0.23"
   }
 }

package/vscode/src/vs/workbench/contrib/languageDetection/browser/languageDetection.contribution.js

@@ -5,6 +5,8 @@ import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
+import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
+import { StatusbarAlignment } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar';
 import { IStatusbarService } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar.service';
 import { LanguageDetectionLanguageEventSource } from 'vscode/vscode/vs/workbench/services/languageDetection/common/languageDetectionWorkerService';
 import { ILanguageDetectionService } from 'vscode/vscode/vs/workbench/services/languageDetection/common/languageDetectionWorkerService.service';
@@ -14,7 +16,9 @@ import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/
 import { registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { NOTEBOOK_EDITOR_EDITABLE } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
+import { KeyCode, KeyMod } from 'vscode/vscode/vs/base/common/keyCodes';
 import { EditorContextKeys } from 'vscode/vscode/vs/editor/common/editorContextKeys';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
@@ -86,7 +90,7 @@ let LanguageDetectionStatusContribution = class LanguageDetectionStatusContribut
                     text: '$(lightbulb-autofix)',
                 };
                 if (!this._combinedEntry) {
-                    this._combinedEntry = this._statusBarService.addEntry(props, LanguageDetectionStatusContribution_1._id, 1 , { id: 'status.editor.mode', alignment: 1 , compact: true });
+                    this._combinedEntry = this._statusBarService.addEntry(props, LanguageDetectionStatusContribution_1._id, StatusbarAlignment.RIGHT, { id: 'status.editor.mode', alignment: StatusbarAlignment.RIGHT, compact: true });
                 }
                 else {
                     this._combinedEntry.update(props);
@@ -107,7 +111,7 @@ LanguageDetectionStatusContribution = LanguageDetectionStatusContribution_1 = (
     ( (__param(4, ILanguageService))),
     ( (__param(5, IKeybindingService)))
 ], LanguageDetectionStatusContribution)));
-( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(LanguageDetectionStatusContribution, 3 );
+( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(LanguageDetectionStatusContribution, LifecyclePhase.Restored);
 registerAction2(class extends Action2 {
     constructor() {
         super({
@@ -118,7 +122,7 @@ registerAction2(class extends Action2 {
                  (NOTEBOOK_EDITOR_EDITABLE.toNegated()),
                 EditorContextKeys.editorTextFocus
             ))),
-            keybinding: { primary: 34  | 512  | 1024 , weight: 200  }
+            keybinding: { primary: KeyCode.KeyD | KeyMod.Alt | KeyMod.Shift, weight: KeybindingWeight.WorkbenchContrib }
         });
     }
     async run(accessor) {

package/vscode/src/vs/workbench/services/languageDetection/browser/languageDetectionWorkerServiceImpl.js

@@ -8,6 +8,7 @@ import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/c
 import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/language';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { isWeb } from 'vscode/vscode/vs/base/common/platform';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
 import { SimpleWorkerClient } from 'vscode/vscode/vs/base/common/worker/simpleWorker';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
@@ -16,6 +17,7 @@ import { ILanguageConfigurationService } from 'vscode/vscode/vs/editor/common/la
 import { IDiagnosticsService } from 'vscode/vscode/vs/platform/diagnostics/common/diagnostics.service';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
+import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { LRUCache } from 'vscode/vscode/vs/base/common/map';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
@@ -119,14 +121,14 @@ let LanguageDetectionService = class LanguageDetectionService extends Disposable
     }
     initEditorOpenedListeners(storageService) {
         try {
-            const globalLangHistoryData = JSON.parse(storageService.get(LanguageDetectionService_1.globalOpenedLanguagesStorageKey, 0 , '[]'));
+            const globalLangHistoryData = JSON.parse(storageService.get(LanguageDetectionService_1.globalOpenedLanguagesStorageKey, StorageScope.PROFILE, '[]'));
             this.historicalGlobalOpenedLanguageIds.fromJSON(globalLangHistoryData);
         }
         catch (e) {
             console.error(e);
         }
         try {
-            const workspaceLangHistoryData = JSON.parse(storageService.get(LanguageDetectionService_1.workspaceOpenedLanguagesStorageKey, 1 , '[]'));
+            const workspaceLangHistoryData = JSON.parse(storageService.get(LanguageDetectionService_1.workspaceOpenedLanguagesStorageKey, StorageScope.WORKSPACE, '[]'));
             this.historicalWorkspaceOpenedLanguageIds.fromJSON(workspaceLangHistoryData);
         }
         catch (e) {
@@ -138,8 +140,8 @@ let LanguageDetectionService = class LanguageDetectionService extends Disposable
                 this.sessionOpenedLanguageIds.add(activeLanguage);
                 this.historicalGlobalOpenedLanguageIds.set(activeLanguage, true);
                 this.historicalWorkspaceOpenedLanguageIds.set(activeLanguage, true);
-                storageService.store(LanguageDetectionService_1.globalOpenedLanguagesStorageKey, JSON.stringify(this.historicalGlobalOpenedLanguageIds.toJSON()), 0 , 1 );
-                storageService.store(LanguageDetectionService_1.workspaceOpenedLanguagesStorageKey, JSON.stringify(this.historicalWorkspaceOpenedLanguageIds.toJSON()), 1 , 1 );
+                storageService.store(LanguageDetectionService_1.globalOpenedLanguagesStorageKey, JSON.stringify(this.historicalGlobalOpenedLanguageIds.toJSON()), StorageScope.PROFILE, StorageTarget.MACHINE);
+                storageService.store(LanguageDetectionService_1.workspaceOpenedLanguagesStorageKey, JSON.stringify(this.historicalWorkspaceOpenedLanguageIds.toJSON()), StorageScope.WORKSPACE, StorageTarget.MACHINE);
                 this.dirtyBiases = true;
             }
         }));