@codingame/monaco-vscode-quickaccess-service-override 1.83.15 → 1.85.0-next.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-quickaccess-service-override",
-  "version": "1.83.15",
+  "version": "1.85.0-next.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,7 +18,7 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@1.83.15",
-    "monaco-editor": "0.44.0"
+    "vscode": "npm:@codingame/monaco-vscode-api@1.85.0-next.0",
+    "monaco-editor": "0.45.0"
   }
 }

package/vscode/src/vs/platform/quickinput/browser/commandsQuickAccess.js

@@ -5,7 +5,7 @@ import { or, matchesPrefix, matchesWords, matchesContiguousSubString } from 'mon
 import { createSingleCallFunction } from 'monaco-editor/esm/vs/base/common/functional.js';
 import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
 import { LRUCache } from 'monaco-editor/esm/vs/base/common/map.js';
-import { normalizeTfIdfScores, TfIdfCalculator } from '../../../base/common/tfIdf.js';
+import { TfIdfCalculator, normalizeTfIdfScores } from 'vscode/vscode/vs/base/common/tfIdf';
 import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
 import { ICommandService } from 'monaco-editor/esm/vs/platform/commands/common/commands.js';
 import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
@@ -13,7 +13,7 @@ import '../../../../../../override/vs/platform/dialogs/common/dialogs.js';
 import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
 import { IKeybindingService } from 'monaco-editor/esm/vs/platform/keybinding/common/keybinding.js';
 import { PickerQuickAccessProvider } from 'vscode/vscode/vs/platform/quickinput/browser/pickerQuickAccess';
-import { IStorageService } from 'monaco-editor/esm/vs/platform/storage/common/storage.js';
+import { WillSaveStateReason, IStorageService } from 'monaco-editor/esm/vs/platform/storage/common/storage.js';
 import { ITelemetryService } from 'monaco-editor/esm/vs/platform/telemetry/common/telemetry.js';
 import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
 
@@ -43,7 +43,7 @@ let AbstractCommandsQuickAccessProvider = class AbstractCommandsQuickAccessProvi
             const tfidf = ( new TfIdfCalculator());
             tfidf.updateDocuments(( allCommandPicks.map(commandPick => ({
                 key: commandPick.commandId,
-                textChunks: [commandPick.label + (commandPick.commandAlias ? ` ${commandPick.commandAlias}` : '')]
+                textChunks: [this.getTfIdfChunk(commandPick)]
             }))));
             const result = tfidf.calculateScores(filter, token);
             return normalizeTfIdfScores(result)
@@ -232,6 +232,16 @@ let AbstractCommandsQuickAccessProvider = class AbstractCommandsQuickAccessProvi
             }
         };
     }
+    getTfIdfChunk({ label, commandAlias, commandDescription }) {
+        let chunk = label;
+        if (commandAlias && commandAlias !== label) {
+            chunk += ` - ${commandAlias}`;
+        }
+        if (commandDescription && commandDescription.value !== label) {
+            chunk += ` - ${commandDescription.value === commandDescription.original ? commandDescription.value : `${commandDescription.value} (${commandDescription.original})`}`;
+        }
+        return chunk;
+    }
 };
 AbstractCommandsQuickAccessProvider = AbstractCommandsQuickAccessProvider_1 = ( __decorate([
     ( __param(1, IInstantiationService)),
@@ -246,6 +256,7 @@ let CommandsHistory = class CommandsHistory extends Disposable {
     static { this.PREF_KEY_CACHE = 'commandPalette.mru.cache'; }
     static { this.PREF_KEY_COUNTER = 'commandPalette.mru.counter'; }
     static { this.counter = 1; }
+    static { this.hasChanges = false; }
     constructor(storageService, configurationService) {
         super();
         this.storageService = storageService;
@@ -257,6 +268,11 @@ let CommandsHistory = class CommandsHistory extends Disposable {
     }
     registerListeners() {
         this._register(this.configurationService.onDidChangeConfiguration(e => this.updateConfiguration(e)));
+        this._register(this.storageService.onWillSaveState(e => {
+            if (e.reason === WillSaveStateReason.SHUTDOWN) {
+                this.saveState();
+            }
+        }));
     }
     updateConfiguration(e) {
         if (e && !e.affectsConfiguration('workbench.commandPalette.history')) {
@@ -265,7 +281,7 @@ let CommandsHistory = class CommandsHistory extends Disposable {
         this.configuredCommandsHistoryLength = CommandsHistory_1.getConfiguredCommandHistoryLength(this.configurationService);
         if (CommandsHistory_1.cache && CommandsHistory_1.cache.limit !== this.configuredCommandsHistoryLength) {
             CommandsHistory_1.cache.limit = this.configuredCommandsHistoryLength;
-            CommandsHistory_1.saveState(this.storageService);
+            CommandsHistory_1.hasChanges = true;
         }
     }
     load() {
@@ -296,19 +312,23 @@ let CommandsHistory = class CommandsHistory extends Disposable {
             return;
         }
         CommandsHistory_1.cache.set(commandId, CommandsHistory_1.counter++);
-        CommandsHistory_1.saveState(this.storageService);
+        CommandsHistory_1.hasChanges = true;
     }
     peek(commandId) {
         return CommandsHistory_1.cache?.peek(commandId);
     }
-    static saveState(storageService) {
+    saveState() {
         if (!CommandsHistory_1.cache) {
             return;
         }
+        if (!CommandsHistory_1.hasChanges) {
+            return;
+        }
         const serializedCache = { usesLRU: true, entries: [] };
         CommandsHistory_1.cache.forEach((value, key) => serializedCache.entries.push({ key, value }));
-        storageService.store(CommandsHistory_1.PREF_KEY_CACHE, JSON.stringify(serializedCache), 0 , 0 );
-        storageService.store(CommandsHistory_1.PREF_KEY_COUNTER, CommandsHistory_1.counter, 0 , 0 );
+        this.storageService.store(CommandsHistory_1.PREF_KEY_CACHE, JSON.stringify(serializedCache), 0 , 0 );
+        this.storageService.store(CommandsHistory_1.PREF_KEY_COUNTER, CommandsHistory_1.counter, 0 , 0 );
+        CommandsHistory_1.hasChanges = false;
     }
     static getConfiguredCommandHistoryLength(configurationService) {
         const config = configurationService.getValue();
@@ -322,7 +342,7 @@ let CommandsHistory = class CommandsHistory extends Disposable {
         const commandHistoryLength = CommandsHistory_1.getConfiguredCommandHistoryLength(configurationService);
         CommandsHistory_1.cache = ( new LRUCache(commandHistoryLength));
         CommandsHistory_1.counter = 1;
-        CommandsHistory_1.saveState(storageService);
+        CommandsHistory_1.hasChanges = true;
     }
 };
 CommandsHistory = CommandsHistory_1 = ( __decorate([

package/vscode/src/vs/workbench/browser/actions/quickAccessActions.js

@@ -110,7 +110,7 @@ registerAction2(class QuickAccessAction extends Action2 {
                 )),
                 original: 'Go to File...'
             },
-            description: {
+            metadata: {
                 description: `Quick access`,
                 args: [{
                         name: 'prefix',

package/vscode/src/vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.js

@@ -27,7 +27,8 @@ import { IProductService } from 'monaco-editor/esm/vs/platform/product/common/pr
 import { IChatService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatService';
 import { ASK_QUICK_QUESTION_ACTION_ID } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatQuickInputActions';
 import { RelatedInformationType, IAiRelatedInformationService } from 'vscode/vscode/vs/workbench/services/aiRelatedInformation/common/aiRelatedInformation';
-import { CHAT_OPEN_ACTION_ID } from '../../chat/browser/actions/chatActions.js';
+import { CHAT_OPEN_ACTION_ID } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { isLocalizedString } from 'monaco-editor/esm/vs/platform/action/common/action.js';
 import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
 
 var CommandsQuickAccessProvider_1;
@@ -193,10 +194,15 @@ let CommandsQuickAccessProvider = class CommandsQuickAccessProvider extends Abst
             const commandAlias = (aliasLabel && category) ?
                 aliasCategory ? `${aliasCategory}: ${aliasLabel}` : `${category}: ${aliasLabel}` :
                 aliasLabel;
+            const metadataDescription = action.item.metadata?.description;
+            const commandDescription = metadataDescription === undefined || isLocalizedString(metadataDescription)
+                ? metadataDescription
+                : { value: metadataDescription, original: metadataDescription };
             globalCommandPicks.push({
                 commandId: action.item.id,
                 commandAlias,
-                label: stripIcons(label)
+                label: stripIcons(label),
+                commandDescription,
             });
         }
         globalCommandsMenu.dispose();

package/vscode/src/vs/workbench/contrib/quickaccess/browser/viewQuickAccess.js

@@ -78,7 +78,7 @@ let ViewQuickAccessProvider = class ViewQuickAccessProvider extends PickerQuickA
             for (const view of viewContainerModel.allViewDescriptors) {
                 if (this.contextKeyService.contextMatchesRules(view.when)) {
                     result.push({
-                        label: view.name,
+                        label: view.name.value,
                         containerLabel: viewContainerModel.title,
                         accept: () => this.viewsService.openView(view.id, true)
                     });

package/vscode/src/vs/workbench/services/quickinput/browser/quickInputService.js

@@ -54,11 +54,20 @@ class QuickInputHoverDelegate {
         this.placement = 'element';
     }
     showHover(options, focus) {
+        const showHoverHint = (options.content instanceof HTMLElement
+            ? options.content.textContent ?? ''
+            : typeof options.content === 'string'
+                ? options.content
+                : options.content.value).length > 20;
         return this.hoverService.showHover({
             ...options,
-            showHoverHint: true,
-            hideOnKeyDown: false,
-            skipFadeInAnimation: true,
+            persistence: {
+                hideOnKeyDown: false,
+            },
+            appearance: {
+                showHoverHint,
+                skipFadeInAnimation: true,
+            },
         }, focus);
     }
     onDidHideHover() {

package/vscode/src/vs/base/common/tfIdf.js

@@ -1,138 +0,0 @@
-function countMapFrom(values) {
-    const map = ( new Map());
-    for (const value of values) {
-        map.set(value, (map.get(value) ?? 0) + 1);
-    }
-    return map;
-}
-class TfIdfCalculator {
-    constructor() {
-        this.chunkCount = 0;
-        this.chunkOccurrences = ( new Map());
-        this.documents = ( new Map());
-    }
-    calculateScores(query, token) {
-        const embedding = this.computeEmbedding(query);
-        const idfCache = ( new Map());
-        const scores = [];
-        for (const [key, doc] of this.documents) {
-            if (token.isCancellationRequested) {
-                return [];
-            }
-            for (const chunk of doc.chunks) {
-                const score = this.computeSimilarityScore(chunk, embedding, idfCache);
-                if (score > 0) {
-                    scores.push({ key, score });
-                }
-            }
-        }
-        return scores;
-    }
-    static termFrequencies(input) {
-        return countMapFrom(TfIdfCalculator.splitTerms(input));
-    }
-    static *splitTerms(input) {
-        const normalize = (word) => word.toLowerCase();
-        for (const [word] of input.matchAll(/\b\p{Letter}[\p{Letter}\d]{2,}\b/gu)) {
-            yield normalize(word);
-            const camelParts = word.split(/(?<=[a-z])(?=[A-Z])/g);
-            if (camelParts.length > 1) {
-                for (const part of camelParts) {
-                    if (part.length > 2 && /\p{Letter}{3,}/gu.test(part)) {
-                        yield normalize(part);
-                    }
-                }
-            }
-        }
-    }
-    updateDocuments(documents) {
-        for (const { key } of documents) {
-            this.deleteDocument(key);
-        }
-        for (const doc of documents) {
-            const chunks = [];
-            for (const text of doc.textChunks) {
-                const tf = TfIdfCalculator.termFrequencies(text);
-                for (const term of ( tf.keys())) {
-                    this.chunkOccurrences.set(term, (this.chunkOccurrences.get(term) ?? 0) + 1);
-                }
-                chunks.push({ text, tf });
-            }
-            this.chunkCount += chunks.length;
-            this.documents.set(doc.key, { chunks });
-        }
-        return this;
-    }
-    deleteDocument(key) {
-        const doc = this.documents.get(key);
-        if (!doc) {
-            return;
-        }
-        this.documents.delete(key);
-        this.chunkCount -= doc.chunks.length;
-        for (const chunk of doc.chunks) {
-            for (const term of ( chunk.tf.keys())) {
-                const currentOccurrences = this.chunkOccurrences.get(term);
-                if (typeof currentOccurrences === 'number') {
-                    const newOccurrences = currentOccurrences - 1;
-                    if (newOccurrences <= 0) {
-                        this.chunkOccurrences.delete(term);
-                    }
-                    else {
-                        this.chunkOccurrences.set(term, newOccurrences);
-                    }
-                }
-            }
-        }
-    }
-    computeSimilarityScore(chunk, queryEmbedding, idfCache) {
-        let sum = 0;
-        for (const [term, termTfidf] of Object.entries(queryEmbedding)) {
-            const chunkTf = chunk.tf.get(term);
-            if (!chunkTf) {
-                continue;
-            }
-            let chunkIdf = idfCache.get(term);
-            if (typeof chunkIdf !== 'number') {
-                chunkIdf = this.computeIdf(term);
-                idfCache.set(term, chunkIdf);
-            }
-            const chunkTfidf = chunkTf * chunkIdf;
-            sum += chunkTfidf * termTfidf;
-        }
-        return sum;
-    }
-    computeEmbedding(input) {
-        const tf = TfIdfCalculator.termFrequencies(input);
-        return this.computeTfidf(tf);
-    }
-    computeIdf(term) {
-        const chunkOccurrences = this.chunkOccurrences.get(term) ?? 0;
-        return chunkOccurrences > 0
-            ? Math.log((this.chunkCount + 1) / chunkOccurrences)
-            : 0;
-    }
-    computeTfidf(termFrequencies) {
-        const embedding = Object.create(null);
-        for (const [word, occurrences] of termFrequencies) {
-            const idf = this.computeIdf(word);
-            if (idf > 0) {
-                embedding[word] = occurrences * idf;
-            }
-        }
-        return embedding;
-    }
-}
-function normalizeTfIdfScores(scores) {
-    const result = scores.slice(0);
-    result.sort((a, b) => b.score - a.score);
-    const max = result[0]?.score ?? 0;
-    if (max > 0) {
-        for (const score of result) {
-            score.score /= max;
-        }
-    }
-    return result;
-}
-
-export { TfIdfCalculator, normalizeTfIdfScores };

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatActions.js

@@ -1,3 +0,0 @@
-const CHAT_OPEN_ACTION_ID = 'workbench.action.chat.open';
-
-export { CHAT_OPEN_ACTION_ID };