@codingame/monaco-vscode-api 16.1.0 → 17.0.0

package/vscode/src/vs/workbench/contrib/snippets/browser/snippetsService.js

@@ -34,7 +34,7 @@ var snippetExt;
     function toValidSnippet(extension, snippet, languageService) {
         if (isFalsyOrWhitespace(snippet.path)) {
             extension.collector.error(( localize(
-                9511,
+                9617,
                 "Expected string in `contributes.{0}.path`. Provided value: {1}",
                 extension.description.name,
                 String(snippet.path)
@@ -43,7 +43,7 @@ var snippetExt;
         }
         if (isFalsyOrWhitespace(snippet.language) && !snippet.path.endsWith('.code-snippets')) {
             extension.collector.error(( localize(
-                9512,
+                9618,
                 "When omitting the language, the value of `contributes.{0}.path` must be a `.code-snippets`-file. Provided value: {1}",
                 extension.description.name,
                 String(snippet.path)
@@ -52,7 +52,7 @@ var snippetExt;
         }
         if (!isFalsyOrWhitespace(snippet.language) && !languageService.isRegisteredLanguageId(snippet.language)) {
             extension.collector.error(( localize(
-                9513,
+                9619,
                 "Unknown language in `contributes.{0}.language`. Provided value: {1}",
                 extension.description.name,
                 String(snippet.language)
@@ -63,7 +63,7 @@ var snippetExt;
         const snippetLocation = joinPath(extensionLocation, snippet.path);
         if (!isEqualOrParent(snippetLocation, extensionLocation)) {
             extension.collector.error(( localize(
-                9514,
+                9620,
                 "Expected `contributes.{0}.path` ({1}) to be included inside extension's folder ({2}). This might make the extension non-portable.",
                 extension.description.name,
                 snippetLocation.path,
@@ -78,7 +78,7 @@ var snippetExt;
     }
     snippetExt.toValidSnippet = toValidSnippet;
     snippetExt.snippetsContribution = {
-        description: ( localize(9515, 'Contributes snippets.')),
+        description: ( localize(9621, 'Contributes snippets.')),
         type: 'array',
         defaultSnippets: [{ body: [{ language: '', path: '' }] }],
         items: {
@@ -86,12 +86,12 @@ var snippetExt;
             defaultSnippets: [{ body: { language: '${1:id}', path: './snippets/${2:id}.json.' } }],
             properties: {
                 language: {
-                    description: ( localize(9516, 'Language identifier for which this snippet is contributed to.')),
+                    description: ( localize(9622, 'Language identifier for which this snippet is contributed to.')),
                     type: 'string'
                 },
                 path: {
                     description: ( localize(
-                        9517,
+                        9623,
                         'Path of the snippets file. The path is relative to the extension folder and typically starts with \'./snippets/\'.'
                     )),
                     type: 'string'
@@ -336,14 +336,14 @@ let SnippetsService = class SnippetsService {
                             file.load().then(file => {
                                 if (( file.data.some(snippet => snippet.isBogous))) {
                                     extension.collector.warn(( localize(
-                                        9518,
+                                        9624,
                                         "One or more snippets from the extension '{0}' very likely confuse snippet-variables and snippet-placeholders (see https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax for more details)",
                                         extension.description.name
                                     )));
                                 }
                             }, err => {
                                 extension.collector.warn(( localize(
-                                    9519,
+                                    9625,
                                     "The snippet file \"{0}\" could not be read.",
                                     (file.location.toString())
                                 )));

package/vscode/src/vs/workbench/contrib/speech/common/speechService.js

@@ -3,16 +3,16 @@ import { localize } from '../../../../nls.js';
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { language } from '../../../../base/common/platform.js';
 
-const HasSpeechProvider = ( new RawContextKey('hasSpeechProvider', false, { type: 'boolean', description: ( localize(9523, "A speech provider is registered to the speech service.")) }));
+const HasSpeechProvider = ( new RawContextKey('hasSpeechProvider', false, { type: 'boolean', description: ( localize(9629, "A speech provider is registered to the speech service.")) }));
 const SpeechToTextInProgress = ( new RawContextKey(
     'speechToTextInProgress',
     false,
-    { type: 'boolean', description: ( localize(9524, "A speech-to-text session is in progress.")) }
+    { type: 'boolean', description: ( localize(9630, "A speech-to-text session is in progress.")) }
 ));
 const TextToSpeechInProgress = ( new RawContextKey(
     'textToSpeechInProgress',
     false,
-    { type: 'boolean', description: ( localize(9525, "A text-to-speech session is in progress.")) }
+    { type: 'boolean', description: ( localize(9631, "A text-to-speech session is in progress.")) }
 ));
 var SpeechToTextStatus;
 (function (SpeechToTextStatus) {
@@ -44,82 +44,82 @@ var AccessibilityVoiceSettingId;
 const SPEECH_LANGUAGE_CONFIG = AccessibilityVoiceSettingId.SpeechLanguage;
 const SPEECH_LANGUAGES = {
     ['da-DK']: {
-        name: ( localize(9526, "Danish (Denmark)"))
+        name: ( localize(9632, "Danish (Denmark)"))
     },
     ['de-DE']: {
-        name: ( localize(9527, "German (Germany)"))
+        name: ( localize(9633, "German (Germany)"))
     },
     ['en-AU']: {
-        name: ( localize(9528, "English (Australia)"))
+        name: ( localize(9634, "English (Australia)"))
     },
     ['en-CA']: {
-        name: ( localize(9529, "English (Canada)"))
+        name: ( localize(9635, "English (Canada)"))
     },
     ['en-GB']: {
-        name: ( localize(9530, "English (United Kingdom)"))
+        name: ( localize(9636, "English (United Kingdom)"))
     },
     ['en-IE']: {
-        name: ( localize(9531, "English (Ireland)"))
+        name: ( localize(9637, "English (Ireland)"))
     },
     ['en-IN']: {
-        name: ( localize(9532, "English (India)"))
+        name: ( localize(9638, "English (India)"))
     },
     ['en-NZ']: {
-        name: ( localize(9533, "English (New Zealand)"))
+        name: ( localize(9639, "English (New Zealand)"))
     },
     ['en-US']: {
-        name: ( localize(9534, "English (United States)"))
+        name: ( localize(9640, "English (United States)"))
     },
     ['es-ES']: {
-        name: ( localize(9535, "Spanish (Spain)"))
+        name: ( localize(9641, "Spanish (Spain)"))
     },
     ['es-MX']: {
-        name: ( localize(9536, "Spanish (Mexico)"))
+        name: ( localize(9642, "Spanish (Mexico)"))
     },
     ['fr-CA']: {
-        name: ( localize(9537, "French (Canada)"))
+        name: ( localize(9643, "French (Canada)"))
     },
     ['fr-FR']: {
-        name: ( localize(9538, "French (France)"))
+        name: ( localize(9644, "French (France)"))
     },
     ['hi-IN']: {
-        name: ( localize(9539, "Hindi (India)"))
+        name: ( localize(9645, "Hindi (India)"))
     },
     ['it-IT']: {
-        name: ( localize(9540, "Italian (Italy)"))
+        name: ( localize(9646, "Italian (Italy)"))
     },
     ['ja-JP']: {
-        name: ( localize(9541, "Japanese (Japan)"))
+        name: ( localize(9647, "Japanese (Japan)"))
     },
     ['ko-KR']: {
-        name: ( localize(9542, "Korean (South Korea)"))
+        name: ( localize(9648, "Korean (South Korea)"))
     },
     ['nl-NL']: {
-        name: ( localize(9543, "Dutch (Netherlands)"))
+        name: ( localize(9649, "Dutch (Netherlands)"))
     },
     ['pt-PT']: {
-        name: ( localize(9544, "Portuguese (Portugal)"))
+        name: ( localize(9650, "Portuguese (Portugal)"))
     },
     ['pt-BR']: {
-        name: ( localize(9545, "Portuguese (Brazil)"))
+        name: ( localize(9651, "Portuguese (Brazil)"))
     },
     ['ru-RU']: {
-        name: ( localize(9546, "Russian (Russia)"))
+        name: ( localize(9652, "Russian (Russia)"))
     },
     ['sv-SE']: {
-        name: ( localize(9547, "Swedish (Sweden)"))
+        name: ( localize(9653, "Swedish (Sweden)"))
     },
     ['tr-TR']: {
-        name: ( localize(9548, "Turkish (Türkiye)"))
+        name: ( localize(9654, "Turkish (Türkiye)"))
     },
     ['zh-CN']: {
-        name: ( localize(9549, "Chinese (Simplified, China)"))
+        name: ( localize(9655, "Chinese (Simplified, China)"))
     },
     ['zh-HK']: {
-        name: ( localize(9550, "Chinese (Traditional, Hong Kong)"))
+        name: ( localize(9656, "Chinese (Traditional, Hong Kong)"))
     },
     ['zh-TW']: {
-        name: ( localize(9551, "Chinese (Traditional, Taiwan)"))
+        name: ( localize(9657, "Chinese (Traditional, Taiwan)"))
     }
 };
 function speechLanguageConfigToLanguage(config, lang = language) {

package/vscode/src/vs/workbench/contrib/tasks/common/taskDefinitionRegistry.js

@@ -13,7 +13,7 @@ const taskDefinitionSchema = {
         type: {
             type: 'string',
             description: ( localize(
-                9949,
+                10055,
                 'The actual task type. Please note that types starting with a \'$\' are reserved for internal usage.'
             ))
         },
@@ -25,7 +25,7 @@ const taskDefinitionSchema = {
         },
         properties: {
             type: 'object',
-            description: ( localize(9950, 'Additional properties of the task type')),
+            description: ( localize(10056, 'Additional properties of the task type')),
             additionalProperties: {
                 $ref: 'http://json-schema.org/draft-07/schema#'
             }
@@ -33,7 +33,7 @@ const taskDefinitionSchema = {
         when: {
             type: 'string',
             markdownDescription: ( localize(
-                9951,
+                10057,
                 'Condition which must be true to enable this type of task. Consider using `shellExecutionSupported`, `processExecutionSupported`, and `customExecutionSupported` as appropriate for this task definition. See the [API documentation](https://code.visualstudio.com/api/extension-guides/task-provider#when-clause) for more information.'
             )),
             default: ''
@@ -49,7 +49,7 @@ var Configuration;
         const taskType = isString(value.type) ? value.type : undefined;
         if (!taskType || taskType.length === 0) {
             messageCollector.error(( localize(
-                9952,
+                10058,
                 'The task type configuration is missing the required \'taskType\' property'
             )));
             return undefined;
@@ -81,7 +81,7 @@ const taskDefinitionsExtPoint = ExtensionsRegistry.registerExtensionPoint({
         }
     },
     jsonSchema: {
-        description: ( localize(9953, 'Contributes task kinds')),
+        description: ( localize(10059, 'Contributes task kinds')),
         type: 'array',
         items: taskDefinitionSchema
     }

package/vscode/src/vs/workbench/contrib/tasks/common/tasks.js

@@ -8,9 +8,9 @@ import { TaskDefinitionRegistry } from './taskDefinitionRegistry.js';
 import { ConfigurationTarget } from '../../../../platform/configuration/common/configuration.js';
 
 const USER_TASKS_GROUP_KEY = 'settings';
-const TASK_RUNNING_STATE = ( new RawContextKey('taskRunning', false, ( localize(9963, "Whether a task is currently running."))));
-const TASK_TERMINAL_ACTIVE = ( new RawContextKey('taskTerminalActive', false, ( localize(9964, "Whether the active terminal is a task terminal."))));
-const TASKS_CATEGORY = ( localize2(9965, "Tasks"));
+const TASK_RUNNING_STATE = ( new RawContextKey('taskRunning', false, ( localize(10069, "Whether a task is currently running."))));
+const TASK_TERMINAL_ACTIVE = ( new RawContextKey('taskTerminalActive', false, ( localize(10070, "Whether the active terminal is a task terminal."))));
+const TASKS_CATEGORY = ( localize2(10071, "Tasks"));
 var ShellQuoting;
 (function (ShellQuoting) {
     ShellQuoting[ShellQuoting["Escape"] = 1] = "Escape";
@@ -765,7 +765,7 @@ var TaskDefinition;
                             break;
                         default:
                             reporter.error(( localize(
-                                9966,
+                                10072,
                                 'Error: the task identifier \'{0}\' is missing the required property \'{1}\'. The task identifier will be ignored.',
                                 JSON.stringify(external, undefined, 0),
                                 property

package/vscode/src/vs/workbench/contrib/terminal/browser/terminal.d.ts

@@ -8,7 +8,7 @@ import { URI } from "../../../../base/common/uri.js";
 import { IKeyMods } from "../../../../platform/quickinput/common/quickInput.js";
 import { IMarkProperties, ITerminalCapabilityStore, ITerminalCommand } from "@codingame/monaco-vscode-0b087f42-a5a3-5eb9-9bfd-1eebc1bba163-common/vscode/vs/platform/terminal/common/capabilities/capabilities";
 import { IMergedEnvironmentVariableCollection } from "@codingame/monaco-vscode-terminal-service-override/vscode/vs/platform/terminal/common/environmentVariable";
-import { IExtensionTerminalProfile, IReconnectionProperties, IShellIntegration, IShellLaunchConfig, ITerminalDimensions, ITerminalLaunchError, ITerminalProfile, ITerminalTabLayoutInfoById, TerminalExitReason, TerminalIcon, TerminalLocation, TerminalShellType, TerminalType, TitleEventSource, WaitOnExitValue, type IDecorationAddon } from "../../../../platform/terminal/common/terminal.js";
+import { IExtensionTerminalProfile, IReconnectionProperties, IShellIntegration, IShellLaunchConfig, ITerminalDimensions, ITerminalLaunchError, ITerminalProfile, ITerminalTabLayoutInfoById, TerminalExitReason, TerminalIcon, TerminalLocation, TerminalShellType, TerminalType, TitleEventSource, WaitOnExitValue, type IDecorationAddon, type ShellIntegrationInjectionFailureReason } from "../../../../platform/terminal/common/terminal.js";
 import { IColorTheme } from "../../../../platform/theme/common/themeService.js";
 import { IWorkspaceFolder } from "../../../../platform/workspace/common/workspace.js";
 import { ITerminalStatusList } from "@codingame/monaco-vscode-terminal-service-override/vscode/vs/workbench/contrib/terminal/browser/terminalStatusList";
@@ -214,6 +214,7 @@ export interface ITerminalInstance extends IBaseTerminalInstance {
     readonly initialCwd?: string;
     readonly os?: OperatingSystem;
     readonly usedShellIntegrationInjection: boolean;
+    readonly shellIntegrationInjectionFailureReason: ShellIntegrationInjectionFailureReason | undefined;
     readonly injectedArgs: string[] | undefined;
     readonly extEnvironmentVariableCollection: IMergedEnvironmentVariableCollection | undefined;
     readonly store: DisposableStore;
@@ -281,7 +282,7 @@ export interface ITerminalInstance extends IBaseTerminalInstance {
     focusWhenReady(force?: boolean): Promise<void>;
     sendText(text: string, shouldExecute: boolean, bracketedPasteMode?: boolean): Promise<void>;
     sendPath(originalPath: string | URI, shouldExecute: boolean): Promise<void>;
-    runCommand(command: string, shouldExecute?: boolean): void;
+    runCommand(command: string, shouldExecute?: boolean): Promise<void>;
     preparePathForShell(originalPath: string): Promise<string>;
     scrollDownLine(): void;
     scrollDownPage(): void;

package/vscode/src/vs/workbench/contrib/testing/common/constants.js

@@ -27,19 +27,19 @@ var TestExplorerViewSorting;
     TestExplorerViewSorting["ByDuration"] = "duration";
 })(TestExplorerViewSorting || (TestExplorerViewSorting = {}));
 const testStateNames = {
-    [TestResultState.Errored]: ( localize(10937, 'Errored')),
-    [TestResultState.Failed]: ( localize(10938, 'Failed')),
-    [TestResultState.Passed]: ( localize(10939, 'Passed')),
-    [TestResultState.Queued]: ( localize(10940, 'Queued')),
-    [TestResultState.Running]: ( localize(10941, 'Running')),
-    [TestResultState.Skipped]: ( localize(10942, 'Skipped')),
-    [TestResultState.Unset]: ( localize(10943, 'Not yet run')),
+    [TestResultState.Errored]: ( localize(11044, 'Errored')),
+    [TestResultState.Failed]: ( localize(11045, 'Failed')),
+    [TestResultState.Passed]: ( localize(11046, 'Passed')),
+    [TestResultState.Queued]: ( localize(11047, 'Queued')),
+    [TestResultState.Running]: ( localize(11048, 'Running')),
+    [TestResultState.Skipped]: ( localize(11049, 'Skipped')),
+    [TestResultState.Unset]: ( localize(11050, 'Not yet run')),
 };
-const labelForTestInState = (label, state) => ( localize(10944, '{0} ({1})', stripIcons(label), testStateNames[state]));
+const labelForTestInState = (label, state) => ( localize(11051, '{0} ({1})', stripIcons(label), testStateNames[state]));
 const testConfigurationGroupNames = {
-    [TestRunProfileBitset.Debug]: ( localize(10945, 'Debug')),
-    [TestRunProfileBitset.Run]: ( localize(10946, 'Run')),
-    [TestRunProfileBitset.Coverage]: ( localize(10947, 'Coverage')),
+    [TestRunProfileBitset.Debug]: ( localize(11052, 'Debug')),
+    [TestRunProfileBitset.Run]: ( localize(11053, 'Run')),
+    [TestRunProfileBitset.Coverage]: ( localize(11054, 'Coverage')),
 };
 var TestCommandId;
 (function (TestCommandId) {

package/vscode/src/vs/workbench/contrib/testing/common/testTypes.js

@@ -46,9 +46,9 @@ var TestRunProfileBitset;
     TestRunProfileBitset[TestRunProfileBitset["SupportsContinuousRun"] = 64] = "SupportsContinuousRun";
 })(TestRunProfileBitset || (TestRunProfileBitset = {}));
 const testProfileBitset = {
-    [TestRunProfileBitset.Run]: ( localize(10952, 'Run')),
-    [TestRunProfileBitset.Debug]: ( localize(10953, 'Debug')),
-    [TestRunProfileBitset.Coverage]: ( localize(10954, 'Coverage')),
+    [TestRunProfileBitset.Run]: ( localize(11059, 'Run')),
+    [TestRunProfileBitset.Debug]: ( localize(11060, 'Debug')),
+    [TestRunProfileBitset.Coverage]: ( localize(11061, 'Coverage')),
 };
 const testRunProfileBitsetList = [
     TestRunProfileBitset.Run,

package/vscode/src/vs/workbench/contrib/webview/browser/webview.service.d.ts

@@ -1,5 +1,5 @@
 import { Event } from "../../../../base/common/event.js";
-import { IWebview, WebviewInitInfo, IWebviewElement, IOverlayWebview } from "@codingame/monaco-vscode-7ba0af96-90c2-5e11-ad7f-befdbbf246c8-common/vscode/vs/workbench/contrib/webview/browser/webview";
+import { IWebview, WebviewInitInfo, IWebviewElement, IOverlayWebview } from "@codingame/monaco-vscode-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common/vscode/vs/workbench/contrib/webview/browser/webview";
 export declare const IWebviewService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IWebviewService>;
 export interface IWebviewService {
     readonly _serviceBrand: undefined;

package/vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewWorkbenchService.service.d.ts

@@ -4,8 +4,8 @@ import { IDisposable } from "../../../../base/common/lifecycle.js";
 import { GroupIdentifier } from "../../../common/editor.js";
 import { IEditorGroup } from "../../../services/editor/common/editorGroupsService.js";
 import { ACTIVE_GROUP_TYPE, SIDE_GROUP_TYPE } from "../../../services/editor/common/editorService.js";
-import { WebviewInitInfo } from "@codingame/monaco-vscode-7ba0af96-90c2-5e11-ad7f-befdbbf246c8-common/vscode/vs/workbench/contrib/webview/browser/webview";
-import { WebviewInput } from "@codingame/monaco-vscode-9b5a5e82-d649-5455-b4bf-ef90d6afd294-common/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput";
+import { WebviewInitInfo } from "@codingame/monaco-vscode-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common/vscode/vs/workbench/contrib/webview/browser/webview";
+import { WebviewInput } from "@codingame/monaco-vscode-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput";
 import { WebviewIconManager, WebviewIcons } from "@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common/vscode/vs/workbench/contrib/webviewPanel/browser/webviewIconManager";
 import { IWebViewShowOptions, WebviewResolver } from "@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common/vscode/vs/workbench/contrib/webviewPanel/browser/webviewWorkbenchService";
 export declare const IWebviewWorkbenchService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IWebviewWorkbenchService>;

package/vscode/src/vs/workbench/services/accounts/common/defaultAccount.js

@@ -164,7 +164,7 @@ class NullDefaultAccountService extends Disposable {
             constructor() {
                 super({
                     id: 'workbench.accounts.actions.signin',
-                    title: ( localize(11784, "Sign in to {0}", authProviderLabel)),
+                    title: ( localize(11913, "Sign in to {0}", authProviderLabel)),
                     menu: {
                         id: MenuId.AccountsContext,
                         when: ( ContextKeyExpr.and(( CONTEXT_DEFAULT_ACCOUNT_STATE.isEqualTo(DefaultAccountStatus.Unavailable)), ( ContextKeyExpr.has('config.extensions.gallery.serviceUrl')))),

package/vscode/src/vs/workbench/services/aiRelatedInformation/common/aiRelatedInformation.service.d.ts

@@ -1,6 +1,6 @@
 import { CancellationToken } from "../../../../base/common/cancellation.js";
 import { IDisposable } from "../../../../base/common/lifecycle.js";
-import { RelatedInformationType, RelatedInformationResult, IAiRelatedInformationProvider } from "@codingame/monaco-vscode-d609a7d3-bf87-551a-884f-550a8b327ec5-common/vscode/vs/workbench/services/aiRelatedInformation/common/aiRelatedInformation";
+import { RelatedInformationType, RelatedInformationResult, IAiRelatedInformationProvider } from "@codingame/monaco-vscode-quickaccess-service-override/vscode/vs/workbench/services/aiRelatedInformation/common/aiRelatedInformation";
 export declare const IAiRelatedInformationService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IAiRelatedInformationService>;
 export interface IAiRelatedInformationService {
     readonly _serviceBrand: undefined;

package/vscode/src/vs/workbench/services/aiSettingsSearch/common/aiSettingsSearch.d.ts

@@ -0,0 +1,17 @@
+import { CancellationToken } from "../../../../base/common/cancellation.js";
+export declare enum AiSettingsSearchResultKind {
+    EMBEDDED = 1,
+    LLM_RANKED = 2,
+    CANCELED = 3
+}
+export interface AiSettingsSearchResult {
+    query: string;
+    kind: AiSettingsSearchResultKind;
+    settings: string[];
+}
+export interface AiSettingsSearchProviderOptions {
+    limit: number;
+}
+export interface IAiSettingsSearchProvider {
+    searchSettings(query: string, option: AiSettingsSearchProviderOptions, token: CancellationToken): void;
+}

package/vscode/src/vs/workbench/services/aiSettingsSearch/common/aiSettingsSearch.js

@@ -0,0 +1,10 @@
+
+
+var AiSettingsSearchResultKind;
+(function (AiSettingsSearchResultKind) {
+    AiSettingsSearchResultKind[AiSettingsSearchResultKind["EMBEDDED"] = 1] = "EMBEDDED";
+    AiSettingsSearchResultKind[AiSettingsSearchResultKind["LLM_RANKED"] = 2] = "LLM_RANKED";
+    AiSettingsSearchResultKind[AiSettingsSearchResultKind["CANCELED"] = 3] = "CANCELED";
+})(AiSettingsSearchResultKind || (AiSettingsSearchResultKind = {}));
+
+export { AiSettingsSearchResultKind };

package/vscode/src/vs/workbench/services/aiSettingsSearch/common/aiSettingsSearch.service.d.ts

@@ -0,0 +1,13 @@
+import { CancellationToken } from "../../../../base/common/cancellation.js";
+import { IDisposable } from "../../../../base/common/lifecycle.js";
+import { IAiSettingsSearchProvider, AiSettingsSearchResult } from "./aiSettingsSearch.js";
+export declare const IAiSettingsSearchService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IAiSettingsSearchService>;
+export interface IAiSettingsSearchService {
+    readonly _serviceBrand: undefined;
+    isEnabled(): boolean;
+    startSearch(query: string, token: CancellationToken): void;
+    getEmbeddingsResults(query: string, token: CancellationToken): Promise<string[] | null>;
+    getLLMRankedResults(query: string, token: CancellationToken): Promise<string[] | null>;
+    registerSettingsSearchProvider(provider: IAiSettingsSearchProvider): IDisposable;
+    handleSearchResult(results: AiSettingsSearchResult): void;
+}

package/vscode/src/vs/workbench/services/aiSettingsSearch/common/aiSettingsSearch.service.js

@@ -0,0 +1,6 @@
+
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+
+const IAiSettingsSearchService = ( createDecorator('IAiSettingsSearchService'));
+
+export { IAiSettingsSearchService };

package/vscode/src/vs/workbench/services/configurationResolver/common/configurationResolverExpression.d.ts

@@ -23,6 +23,7 @@ export declare class ConfigurationResolverExpression<T> implements IConfiguratio
     private locations;
     private root;
     private stringRoot;
+    private newReplacementNotifiers;
     private constructor();
     static parse<T>(object: T): ConfigurationResolverExpression<T>;
     private applyPlatformSpecificKeys;
@@ -35,6 +36,7 @@ export declare class ConfigurationResolverExpression<T> implements IConfiguratio
         IResolvedValue
     ]>;
     resolve(replacement: Replacement, data: string | IResolvedValue): void;
+    private _resolveAtLocation;
     toObject(): T;
 }
 export {};

package/vscode/src/vs/workbench/services/configurationResolver/common/configurationResolverExpression.js

@@ -6,6 +6,7 @@ class ConfigurationResolverExpression {
     static { this.VARIABLE_LHS = '${'; }
     constructor(object) {
         this.locations = ( new Map());
+        this.newReplacementNotifiers = ( new Set());
         if (typeof object === 'string') {
             this.stringRoot = true;
             this.root = { value: object };
@@ -27,10 +28,9 @@ class ConfigurationResolverExpression {
     applyPlatformSpecificKeys() {
         const config = this.root;
         const key = isWindows ? 'windows' : isMacintosh ? 'osx' : isLinux ? 'linux' : undefined;
-        if (key === undefined || !config || typeof config !== 'object' || !config.hasOwnProperty(key)) {
-            return;
+        if (key && config && typeof config === 'object' && config.hasOwnProperty(key)) {
+            ( Object.keys(config[key])).forEach(k => config[k] = config[key][k]);
         }
-        ( Object.keys(config[key])).forEach(k => config[k] = config[key][k]);
         delete config.windows;
         delete config.osx;
         delete config.linux;
@@ -96,8 +96,11 @@ class ConfigurationResolverExpression {
                 this.parseObject(value);
             }
         }
+        for (const [key] of Object.entries(obj)) {
+            this.parseString(obj, key, key, true);
+        }
     }
-    parseString(object, propertyName, value) {
+    parseString(object, propertyName, value, replaceKeyName, replacementPath) {
         let pos = 0;
         while (pos < value.length) {
             const match = value.indexOf('${', pos);
@@ -106,18 +109,47 @@ class ConfigurationResolverExpression {
             }
             const parsed = this.parseVariable(value, match);
             if (parsed) {
+                pos = parsed.end + 1;
+                if (replacementPath?.includes(parsed.replacement.id)) {
+                    continue;
+                }
                 const locations = this.locations.get(parsed.replacement.id) || { locations: [], replacement: parsed.replacement };
-                locations.locations.push({ object, propertyName });
+                const newLocation = { object, propertyName, replaceKeyName };
+                locations.locations.push(newLocation);
                 this.locations.set(parsed.replacement.id, locations);
-                pos = parsed.end + 1;
+                if (locations.resolved) {
+                    this._resolveAtLocation(parsed.replacement, newLocation, locations.resolved, replacementPath);
+                }
+                else {
+                    this.newReplacementNotifiers.forEach(n => n(parsed.replacement));
+                }
             }
             else {
                 pos = match + 2;
             }
         }
     }
-    unresolved() {
-        return ( Iterable.map(Iterable.filter(( this.locations.values()), l => l.resolved === undefined), l => l.replacement));
+    *unresolved() {
+        const newReplacements = ( new Map());
+        const notifier = (replacement) => {
+            newReplacements.set(replacement.id, replacement);
+        };
+        for (const location of ( this.locations.values())) {
+            if (location.resolved === undefined) {
+                newReplacements.set(location.replacement.id, location.replacement);
+            }
+        }
+        this.newReplacementNotifiers.add(notifier);
+        while (true) {
+            const next = Iterable.first(newReplacements);
+            if (!next) {
+                break;
+            }
+            const [key, value] = next;
+            yield value;
+            newReplacements.delete(key);
+        }
+        this.newReplacementNotifiers.delete(notifier);
     }
     resolved() {
         return ( Iterable.map(Iterable.filter(( this.locations.values()), l => !!l.resolved), l => [l.replacement, l.resolved]));
@@ -130,13 +162,30 @@ class ConfigurationResolverExpression {
         if (!location) {
             return;
         }
+        location.resolved = data;
         if (data.value !== undefined) {
-            for (const { object, propertyName } of location.locations || []) {
-                const newValue = object[propertyName].replaceAll(replacement.id, data.value);
-                object[propertyName] = newValue;
+            for (const l of location.locations || Iterable.empty()) {
+                this._resolveAtLocation(replacement, l, data);
             }
         }
-        location.resolved = data;
+    }
+    _resolveAtLocation(replacement, { replaceKeyName, propertyName, object }, data, path = []) {
+        if (data.value === undefined) {
+            return;
+        }
+        path.push(replacement.id);
+        if (replaceKeyName && typeof propertyName === 'string') {
+            const value = object[propertyName];
+            const newKey = propertyName.replaceAll(replacement.id, data.value);
+            delete object[propertyName];
+            object[newKey] = value;
+            this.parseString(object, newKey, data.value, true, path);
+        }
+        else {
+            this.parseString(object, propertyName, data.value, false, path);
+            object[propertyName] = object[propertyName].replaceAll(replacement.id, data.value);
+        }
+        path.pop();
     }
     toObject() {
         if (this.stringRoot) {

package/vscode/src/vs/workbench/services/configurationResolver/common/variableResolver.d.ts

@@ -1,9 +1,10 @@
+import { IStringDictionary } from "../../../../base/common/collections.js";
 import { IProcessEnvironment } from "../../../../base/common/platform.js";
 import { URI as uri } from "../../../../base/common/uri.js";
 import { ILabelService } from "../../../../platform/label/common/label.service.js";
 import { IWorkspaceFolderData } from "../../../../platform/workspace/common/workspace.js";
 import { IConfigurationResolverService } from "./configurationResolver.service.js";
-import { ConfigurationResolverExpression } from "./configurationResolverExpression.js";
+import { ConfigurationResolverExpression, IResolvedValue, Replacement } from "./configurationResolverExpression.js";
 interface IVariableResolveContext {
     getFolderUri(folderName: string): uri | undefined;
     getWorkspaceFolderCount(): number;
@@ -35,7 +36,7 @@ export declare abstract class AbstractVariableResolverService implements IConfig
     resolveWithInteraction(folder: IWorkspaceFolderData | undefined, config: any): Promise<Map<string, string> | undefined>;
     contributeVariable(variable: string, resolution: () => Promise<string | undefined>): void;
     private fsPath;
-    private evaluateSingleVariable;
+    protected evaluateSingleVariable(replacement: Replacement, folderUri: uri | undefined, processEnvironment?: IProcessEnvironment, commandValueMapping?: IStringDictionary<IResolvedValue>): Promise<IResolvedValue | string | undefined>;
     private resolveFromMap;
 }
 export {};