@codingame/monaco-vscode-api 17.2.0 → 18.0.0

package/vscode/src/vs/workbench/contrib/notebook/common/notebookCommon.d.ts

@@ -19,11 +19,11 @@ import { IFileReadLimits } from "../../../../platform/files/common/files.js";
 import { UndoRedoGroup } from "../../../../platform/undoRedo/common/undoRedo.js";
 import { IRevertOptions, ISaveOptions, IUntypedEditorInput } from "../../../common/editor.js";
 import { NotebookTextModel } from "@codingame/monaco-vscode-notebook-service-override/vscode/vs/workbench/contrib/notebook/common/model/notebookTextModel";
-import { ICellExecutionError } from "@codingame/monaco-vscode-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService";
+import { ICellExecutionError } from "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService";
 import { INotebookTextModelLike } from "./notebookKernelService.js";
-import { ICellRange } from "@codingame/monaco-vscode-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common/vscode/vs/workbench/contrib/notebook/common/notebookRange";
+import { ICellRange } from "@codingame/monaco-vscode-4372ad43-a220-5e78-83e6-95a9cfd64384-common/vscode/vs/workbench/contrib/notebook/common/notebookRange";
 import { RegisteredEditorPriority } from "../../../services/editor/common/editorResolverService.js";
-import { IWorkingCopyBackupMeta, IWorkingCopySaveEvent } from "@codingame/monaco-vscode-86d65fc6-30f9-5dca-9501-e249de688591-common/vscode/vs/workbench/services/workingCopy/common/workingCopy";
+import { IWorkingCopyBackupMeta, IWorkingCopySaveEvent } from "@codingame/monaco-vscode-a4683c2b-a0d2-5112-96ba-eedc605346d2-common/vscode/vs/workbench/services/workingCopy/common/workingCopy";
 import { SnapshotContext } from "@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/services/workingCopy/common/fileWorkingCopy";
 export declare const NOTEBOOK_EDITOR_ID = "workbench.editor.notebook";
 export declare const NOTEBOOK_DIFF_EDITOR_ID = "workbench.editor.notebookTextDiffEditor";

package/vscode/src/vs/workbench/contrib/notebook/common/notebookExecutionService.d.ts

@@ -1,5 +1,5 @@
 import { IOutputDto, IOutputItemDto } from "./notebookCommon.js";
-import { INotebookCellExecution } from "@codingame/monaco-vscode-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService";
+import { INotebookCellExecution } from "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService";
 export declare enum CellExecutionUpdateType {
     Output = 1,
     OutputItems = 2,

package/vscode/src/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service.d.ts

@@ -1,6 +1,6 @@
 import { Event } from "../../../../base/common/event.js";
 import { URI } from "../../../../base/common/uri.js";
-import { ICellExecutionStateChangedEvent, IExecutionStateChangedEvent, INotebookFailStateChangedEvent, INotebookCellExecution, INotebookExecution } from "@codingame/monaco-vscode-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService";
+import { ICellExecutionStateChangedEvent, IExecutionStateChangedEvent, INotebookFailStateChangedEvent, INotebookCellExecution, INotebookExecution } from "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService";
 export declare const INotebookExecutionStateService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<INotebookExecutionStateService>;
 export interface INotebookExecutionStateService {
     _serviceBrand: undefined;

package/vscode/src/vs/workbench/contrib/notebook/common/notebookService.service.d.ts

@@ -9,7 +9,7 @@ import { NotebookCellTextModel } from "@codingame/monaco-vscode-e28ac690-06d5-5e
 import { NotebookTextModel } from "@codingame/monaco-vscode-notebook-service-override/vscode/vs/workbench/contrib/notebook/common/model/notebookTextModel";
 import { NotebookExtensionDescription, IOutputDto, IOrderedMimeType, INotebookRendererInfo, INotebookStaticPreloadInfo, INotebookContributionData } from "./notebookCommon.js";
 import { NotebookProviderInfo } from "@codingame/monaco-vscode-notebook-service-override/vscode/vs/workbench/contrib/notebook/common/notebookProvider";
-import { INotebookSerializer, SimpleNotebookProviderInfo } from "@codingame/monaco-vscode-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common/vscode/vs/workbench/contrib/notebook/common/notebookService";
+import { INotebookSerializer, SimpleNotebookProviderInfo } from "@codingame/monaco-vscode-4372ad43-a220-5e78-83e6-95a9cfd64384-common/vscode/vs/workbench/contrib/notebook/common/notebookService";
 export declare const INotebookService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<INotebookService>;
 export interface INotebookService {
     readonly _serviceBrand: undefined;

package/vscode/src/vs/workbench/contrib/preferences/common/preferences.service.d.ts

@@ -1,7 +1,8 @@
-import { ISearchProvider } from "@codingame/monaco-vscode-0f5ced28-abde-558b-8652-db8e7d4d64aa-common/vscode/vs/workbench/contrib/preferences/common/preferences";
+import { ISearchProvider, IAiSearchProvider } from "@codingame/monaco-vscode-7869cfe8-f42c-5721-9f2b-7d04a6a41f16-common/vscode/vs/workbench/contrib/preferences/common/preferences";
 export declare const IPreferencesSearchService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IPreferencesSearchService>;
 export interface IPreferencesSearchService {
     readonly _serviceBrand: undefined;
     getLocalSearchProvider(filter: string): ISearchProvider;
     getRemoteSearchProvider(filter: string, newExtensionsOnly?: boolean): ISearchProvider | undefined;
+    getAiSearchProvider(filter: string): IAiSearchProvider;
 }

package/vscode/src/vs/workbench/contrib/scm/common/history.d.ts

@@ -1,3 +1,4 @@
+import { CancellationToken } from "../../../../base/common/cancellation.js";
 import { IObservable } from "../../../../base/common/observable.js";
 import { ThemeIcon } from "../../../../base/common/themables.js";
 import { URI } from "../../../../base/common/uri.js";
@@ -12,10 +13,11 @@ export interface ISCMHistoryProvider {
     readonly historyItemRemoteRef: IObservable<ISCMHistoryItemRef | undefined>;
     readonly historyItemBaseRef: IObservable<ISCMHistoryItemRef | undefined>;
     readonly historyItemRefChanges: IObservable<ISCMHistoryItemRefsChangeEvent>;
-    provideHistoryItemRefs(historyItemsRefs?: string[]): Promise<ISCMHistoryItemRef[] | undefined>;
-    provideHistoryItems(options: ISCMHistoryOptions): Promise<ISCMHistoryItem[] | undefined>;
-    provideHistoryItemChanges(historyItemId: string, historyItemParentId: string | undefined): Promise<ISCMHistoryItemChange[] | undefined>;
-    resolveHistoryItemRefsCommonAncestor(historyItemRefs: string[]): Promise<string | undefined>;
+    provideHistoryItemRefs(historyItemsRefs?: string[], token?: CancellationToken): Promise<ISCMHistoryItemRef[] | undefined>;
+    provideHistoryItems(options: ISCMHistoryOptions, token?: CancellationToken): Promise<ISCMHistoryItem[] | undefined>;
+    provideHistoryItemChanges(historyItemId: string, historyItemParentId: string | undefined, token?: CancellationToken): Promise<ISCMHistoryItemChange[] | undefined>;
+    resolveHistoryItemChatContext(historyItemId: string, token?: CancellationToken): Promise<string | undefined>;
+    resolveHistoryItemRefsCommonAncestor(historyItemRefs: string[], token?: CancellationToken): Promise<string | undefined>;
 }
 export interface ISCMHistoryOptions {
     readonly skip?: number;
@@ -23,6 +25,7 @@ export interface ISCMHistoryOptions {
         id?: string;
     };
     readonly historyItemRefs?: readonly string[];
+    readonly filterText?: string;
 }
 export interface ISCMHistoryItemStatistics {
     readonly files: number;
@@ -78,6 +81,13 @@ export interface SCMHistoryItemViewModelTreeElement {
     readonly historyItemViewModel: ISCMHistoryItemViewModel;
     readonly type: "historyItemViewModel";
 }
+export interface SCMHistoryItemChangeViewModelTreeElement {
+    readonly repository: ISCMRepository;
+    readonly historyItemViewModel: ISCMHistoryItemViewModel;
+    readonly historyItemChange: ISCMHistoryItemChange;
+    readonly graphColumns: ISCMHistoryItemGraphNode[];
+    readonly type: "historyItemChangeViewModel";
+}
 export interface SCMHistoryItemLoadMoreTreeElement {
     readonly repository: ISCMRepository;
     readonly graphColumns: ISCMHistoryItemGraphNode[];

package/vscode/src/vs/workbench/contrib/scm/common/quickDiff.service.d.ts

@@ -1,7 +1,7 @@
 import { Event } from "../../../../base/common/event.js";
 import { IDisposable } from "../../../../base/common/lifecycle.js";
 import { URI } from "../../../../base/common/uri.js";
-import { QuickDiffProvider, QuickDiff } from "@codingame/monaco-vscode-bb83fe45-f4c7-5673-b9f1-5c409a63f19c-common/vscode/vs/workbench/contrib/scm/common/quickDiff";
+import { QuickDiffProvider, QuickDiff } from "@codingame/monaco-vscode-f338ac19-278c-5fe1-bec8-b588de04a788-common/vscode/vs/workbench/contrib/scm/common/quickDiff";
 export declare const IQuickDiffService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IQuickDiffService>;
 export interface IQuickDiffService {
     readonly _serviceBrand: undefined;

package/vscode/src/vs/workbench/contrib/scm/common/quickDiffService.d.ts

@@ -1,6 +1,6 @@
 import { URI } from "../../../../base/common/uri.js";
 import { Disposable, IDisposable } from "../../../../base/common/lifecycle.js";
-import { QuickDiff, QuickDiffProvider } from "@codingame/monaco-vscode-bb83fe45-f4c7-5673-b9f1-5c409a63f19c-common/vscode/vs/workbench/contrib/scm/common/quickDiff";
+import { QuickDiff, QuickDiffProvider } from "@codingame/monaco-vscode-f338ac19-278c-5fe1-bec8-b588de04a788-common/vscode/vs/workbench/contrib/scm/common/quickDiff";
 import { IQuickDiffService } from "./quickDiff.service.js";
 import { IUriIdentityService } from "../../../../platform/uriIdentity/common/uriIdentity.service.js";
 import { IStorageService } from "../../../../platform/storage/common/storage.service.js";

package/vscode/src/vs/workbench/contrib/scm/common/quickDiffService.js

@@ -81,13 +81,17 @@ let QuickDiffService = class QuickDiffService extends Disposable {
         const providers = Array.from(this.quickDiffProviders)
             .filter(provider => !provider.rootUri || this.uriIdentityService.extUri.isEqualOrParent(uri, provider.rootUri))
             .sort(createProviderComparer(uri));
-        const quickDiffOriginalResources = await Promise.all(( providers.map(async (provider) => {
+        const quickDiffOriginalResources = await Promise.allSettled(( providers.map(async (provider) => {
             const scoreValue = provider.selector ? score(provider.selector, uri, language, isSynchronized, undefined, undefined) : 10;
             const originalResource = scoreValue > 0 ? (await provider.getOriginalResource(uri)) ?? undefined : undefined;
             return { provider, originalResource };
         })));
         const quickDiffs = [];
-        for (const { provider, originalResource } of quickDiffOriginalResources) {
+        for (const quickDiffOriginalResource of quickDiffOriginalResources) {
+            if (quickDiffOriginalResource.status === 'rejected') {
+                continue;
+            }
+            const { provider, originalResource } = quickDiffOriginalResource.value;
             if (!originalResource) {
                 continue;
             }

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

@@ -1,5 +1,5 @@
 import { IProgress, IProgressStep } from "../../../../platform/progress/common/progress.js";
-import { ISearchTreeMatch, ISearchTreeFileMatch, FileMatchOrMatch } from "@codingame/monaco-vscode-42931eb9-e564-530c-bafc-fa23ab43a070-common/vscode/vs/workbench/contrib/search/browser/searchTreeModel/searchTreeCommon";
+import { ISearchTreeMatch, ISearchTreeFileMatch, FileMatchOrMatch } from "@codingame/monaco-vscode-85f7fb0f-70f5-5a5e-831b-15c743a8bd11-common/vscode/vs/workbench/contrib/search/browser/searchTreeModel/searchTreeCommon";
 export declare const IReplaceService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IReplaceService>;
 export interface IReplaceService {
     readonly _serviceBrand: undefined;

package/vscode/src/vs/workbench/contrib/search/browser/searchTreeModel/searchViewModelWorkbenchService.service.d.ts

@@ -1,4 +1,4 @@
-import { ISearchModel } from "@codingame/monaco-vscode-42931eb9-e564-530c-bafc-fa23ab43a070-common/vscode/vs/workbench/contrib/search/browser/searchTreeModel/searchTreeCommon";
+import { ISearchModel } from "@codingame/monaco-vscode-85f7fb0f-70f5-5a5e-831b-15c743a8bd11-common/vscode/vs/workbench/contrib/search/browser/searchTreeModel/searchTreeCommon";
 export declare const ISearchViewModelWorkbenchService: import("../../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<ISearchViewModelWorkbenchService>;
 export interface ISearchViewModelWorkbenchService {
     readonly _serviceBrand: undefined;

package/vscode/src/vs/workbench/contrib/search/common/searchHistoryService.service.d.ts

@@ -1,5 +1,5 @@
 import { Event } from "../../../../base/common/event.js";
-import { ISearchHistoryValues } from "@codingame/monaco-vscode-search-service-override/vscode/vs/workbench/contrib/search/common/searchHistoryService";
+import { ISearchHistoryValues } from "@codingame/monaco-vscode-bc8c28cd-7a80-54a9-af1a-e6b1e7a7f34a-common/vscode/vs/workbench/contrib/search/common/searchHistoryService";
 export interface ISearchHistoryService {
     readonly _serviceBrand: undefined;
     onDidClearHistory: Event<void>;

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

@@ -27,7 +27,7 @@ class SnippetCompletion {
     constructor(snippet, range) {
         this.snippet = snippet;
         this.label = { label: snippet.prefix, description: snippet.name };
-        this.detail = ( localize(9597, "{0} ({1})", snippet.description || snippet.name, snippet.source));
+        this.detail = ( localize(9854, "{0} ({1})", snippet.description || snippet.name, snippet.source));
         this.insertText = snippet.codeSnippet;
         this.extensionId = snippet.extensionId;
         this.range = range;
@@ -121,14 +121,14 @@ let SnippetCompletionProvider = class SnippetCompletionProvider {
             let to = i + 1;
             for (; to < suggestions.length && item.label === suggestions[to].label; to++) {
                 suggestions[to].label.label = ( localize(
-                    9598,
+                    9855,
                     "{0}, {1}",
                     suggestions[to].label.label,
                     suggestions[to].snippet.name
                 ));
             }
             if (to > i + 1) {
-                suggestions[i].label.label = ( localize(9598, "{0}, {1}", suggestions[i].label.label, suggestions[i].snippet.name));
+                suggestions[i].label.label = ( localize(9855, "{0}, {1}", suggestions[i].label.label, suggestions[i].snippet.name));
                 i = to;
             }
         }

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

@@ -207,14 +207,14 @@ class SnippetFile {
             source = this._extension.displayName || this._extension.name;
         }
         else if (this.source === SnippetSource.Workspace) {
-            source = ( localize(9614, "Workspace Snippet"));
+            source = ( localize(9871, "Workspace Snippet"));
         }
         else {
             if (this.isGlobalSnippets) {
-                source = ( localize(9615, "Global User Snippet"));
+                source = ( localize(9872, "Global User Snippet"));
             }
             else {
-                source = ( localize(9616, "User Snippet"));
+                source = ( localize(9873, "User Snippet"));
             }
         }
         for (const _prefix of Iterable.wrap(prefix)) {

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(
-                9617,
+                9874,
                 "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(
-                9618,
+                9875,
                 "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(
-                9619,
+                9876,
                 "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(
-                9620,
+                9877,
                 "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(9621, 'Contributes snippets.')),
+        description: ( localize(9878, '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(9622, 'Language identifier for which this snippet is contributed to.')),
+                    description: ( localize(9879, 'Language identifier for which this snippet is contributed to.')),
                     type: 'string'
                 },
                 path: {
                     description: ( localize(
-                        9623,
+                        9880,
                         '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(
-                                        9624,
+                                        9881,
                                         "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(
-                                    9625,
+                                    9882,
                                     "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(9629, "A speech provider is registered to the speech service.")) }));
+const HasSpeechProvider = ( new RawContextKey('hasSpeechProvider', false, { type: 'boolean', description: ( localize(9886, "A speech provider is registered to the speech service.")) }));
 const SpeechToTextInProgress = ( new RawContextKey(
     'speechToTextInProgress',
     false,
-    { type: 'boolean', description: ( localize(9630, "A speech-to-text session is in progress.")) }
+    { type: 'boolean', description: ( localize(9887, "A speech-to-text session is in progress.")) }
 ));
 const TextToSpeechInProgress = ( new RawContextKey(
     'textToSpeechInProgress',
     false,
-    { type: 'boolean', description: ( localize(9631, "A text-to-speech session is in progress.")) }
+    { type: 'boolean', description: ( localize(9888, "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(9632, "Danish (Denmark)"))
+        name: ( localize(9889, "Danish (Denmark)"))
     },
     ['de-DE']: {
-        name: ( localize(9633, "German (Germany)"))
+        name: ( localize(9890, "German (Germany)"))
     },
     ['en-AU']: {
-        name: ( localize(9634, "English (Australia)"))
+        name: ( localize(9891, "English (Australia)"))
     },
     ['en-CA']: {
-        name: ( localize(9635, "English (Canada)"))
+        name: ( localize(9892, "English (Canada)"))
     },
     ['en-GB']: {
-        name: ( localize(9636, "English (United Kingdom)"))
+        name: ( localize(9893, "English (United Kingdom)"))
     },
     ['en-IE']: {
-        name: ( localize(9637, "English (Ireland)"))
+        name: ( localize(9894, "English (Ireland)"))
     },
     ['en-IN']: {
-        name: ( localize(9638, "English (India)"))
+        name: ( localize(9895, "English (India)"))
     },
     ['en-NZ']: {
-        name: ( localize(9639, "English (New Zealand)"))
+        name: ( localize(9896, "English (New Zealand)"))
     },
     ['en-US']: {
-        name: ( localize(9640, "English (United States)"))
+        name: ( localize(9897, "English (United States)"))
     },
     ['es-ES']: {
-        name: ( localize(9641, "Spanish (Spain)"))
+        name: ( localize(9898, "Spanish (Spain)"))
     },
     ['es-MX']: {
-        name: ( localize(9642, "Spanish (Mexico)"))
+        name: ( localize(9899, "Spanish (Mexico)"))
     },
     ['fr-CA']: {
-        name: ( localize(9643, "French (Canada)"))
+        name: ( localize(9900, "French (Canada)"))
     },
     ['fr-FR']: {
-        name: ( localize(9644, "French (France)"))
+        name: ( localize(9901, "French (France)"))
     },
     ['hi-IN']: {
-        name: ( localize(9645, "Hindi (India)"))
+        name: ( localize(9902, "Hindi (India)"))
     },
     ['it-IT']: {
-        name: ( localize(9646, "Italian (Italy)"))
+        name: ( localize(9903, "Italian (Italy)"))
     },
     ['ja-JP']: {
-        name: ( localize(9647, "Japanese (Japan)"))
+        name: ( localize(9904, "Japanese (Japan)"))
     },
     ['ko-KR']: {
-        name: ( localize(9648, "Korean (South Korea)"))
+        name: ( localize(9905, "Korean (South Korea)"))
     },
     ['nl-NL']: {
-        name: ( localize(9649, "Dutch (Netherlands)"))
+        name: ( localize(9906, "Dutch (Netherlands)"))
     },
     ['pt-PT']: {
-        name: ( localize(9650, "Portuguese (Portugal)"))
+        name: ( localize(9907, "Portuguese (Portugal)"))
     },
     ['pt-BR']: {
-        name: ( localize(9651, "Portuguese (Brazil)"))
+        name: ( localize(9908, "Portuguese (Brazil)"))
     },
     ['ru-RU']: {
-        name: ( localize(9652, "Russian (Russia)"))
+        name: ( localize(9909, "Russian (Russia)"))
     },
     ['sv-SE']: {
-        name: ( localize(9653, "Swedish (Sweden)"))
+        name: ( localize(9910, "Swedish (Sweden)"))
     },
     ['tr-TR']: {
-        name: ( localize(9654, "Turkish (Türkiye)"))
+        name: ( localize(9911, "Turkish (Türkiye)"))
     },
     ['zh-CN']: {
-        name: ( localize(9655, "Chinese (Simplified, China)"))
+        name: ( localize(9912, "Chinese (Simplified, China)"))
     },
     ['zh-HK']: {
-        name: ( localize(9656, "Chinese (Traditional, Hong Kong)"))
+        name: ( localize(9913, "Chinese (Traditional, Hong Kong)"))
     },
     ['zh-TW']: {
-        name: ( localize(9657, "Chinese (Traditional, Taiwan)"))
+        name: ( localize(9914, "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(
-                10055,
+                10320,
                 '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(10056, 'Additional properties of the task type')),
+            description: ( localize(10321, '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(
-                10057,
+                10322,
                 '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(
-                10058,
+                10323,
                 'The task type configuration is missing the required \'taskType\' property'
             )));
             return undefined;
@@ -81,7 +81,7 @@ const taskDefinitionsExtPoint = ExtensionsRegistry.registerExtensionPoint({
         }
     },
     jsonSchema: {
-        description: ( localize(10059, 'Contributes task kinds')),
+        description: ( localize(10324, 'Contributes task kinds')),
         type: 'array',
         items: taskDefinitionSchema
     }

package/vscode/src/vs/workbench/contrib/tasks/common/tasks.d.ts

@@ -213,10 +213,18 @@ export declare enum RunOnOptions {
     default = 1,
     folderOpen = 2
 }
+export declare enum InstancePolicy {
+    terminateNewest = "terminateNewest",
+    terminateOldest = "terminateOldest",
+    prompt = "prompt",
+    warn = "warn",
+    silent = "silent"
+}
 export interface IRunOptions {
     reevaluateOnRerun?: boolean;
     runOn?: RunOnOptions;
     instanceLimit?: number;
+    instancePolicy?: InstancePolicy;
 }
 export declare namespace RunOptions {
     const defaults: IRunOptions;

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(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"));
+const TASK_RUNNING_STATE = ( new RawContextKey('taskRunning', false, ( localize(10334, "Whether a task is currently running."))));
+const TASK_TERMINAL_ACTIVE = ( new RawContextKey('taskTerminalActive', false, ( localize(10335, "Whether the active terminal is a task terminal."))));
+const TASKS_CATEGORY = ( localize2(10336, "Tasks"));
 var ShellQuoting;
 (function (ShellQuoting) {
     ShellQuoting[ShellQuoting["Escape"] = 1] = "Escape";
@@ -209,9 +209,17 @@ var RunOnOptions;
     RunOnOptions[RunOnOptions["default"] = 1] = "default";
     RunOnOptions[RunOnOptions["folderOpen"] = 2] = "folderOpen";
 })(RunOnOptions || (RunOnOptions = {}));
+var InstancePolicy;
+(function (InstancePolicy) {
+    InstancePolicy["terminateNewest"] = "terminateNewest";
+    InstancePolicy["terminateOldest"] = "terminateOldest";
+    InstancePolicy["prompt"] = "prompt";
+    InstancePolicy["warn"] = "warn";
+    InstancePolicy["silent"] = "silent";
+})(InstancePolicy || (InstancePolicy = {}));
 var RunOptions;
 (function (RunOptions) {
-    RunOptions.defaults = { reevaluateOnRerun: true, runOn: RunOnOptions.default, instanceLimit: 1 };
+    RunOptions.defaults = { reevaluateOnRerun: true, runOn: RunOnOptions.default, instanceLimit: 1, instancePolicy: InstancePolicy.prompt };
 })(RunOptions || (RunOptions = {}));
 class CommonTask {
     constructor(id, label, type, runOptions, configurationProperties, source) {
@@ -765,7 +773,7 @@ var TaskDefinition;
                             break;
                         default:
                             reporter.error(( localize(
-                                10072,
+                                10337,
                                 'Error: the task identifier \'{0}\' is missing the required property \'{1}\'. The task identifier will be ignored.',
                                 JSON.stringify(external, undefined, 0),
                                 property
@@ -780,4 +788,4 @@ var TaskDefinition;
     TaskDefinition.createTaskIdentifier = createTaskIdentifier;
 })(TaskDefinition || (TaskDefinition = {}));
 
-export { CUSTOMIZED_TASK_TYPE, CommandOptions, CommandString, CommonTask, ConfiguringTask, ContributedTask, CustomTask, DependsOrder, ExecutionEngine, InMemoryTask, JsonSchemaVersion, KeyedTaskIdentifier, PanelKind, PresentationOptions, RevealKind, RevealProblemKind, RunOnOptions, RunOptions, RuntimeType, ShellQuoting, TASKS_CATEGORY, TASK_RUNNING_STATE, TASK_TERMINAL_ACTIVE, TaskDefinition, TaskEvent, TaskEventKind, TaskGroup, TaskRunSource, TaskRunType, TaskScope, TaskSettingId, TaskSorter, TaskSourceKind, TasksSchemaProperties, USER_TASKS_GROUP_KEY };
+export { CUSTOMIZED_TASK_TYPE, CommandOptions, CommandString, CommonTask, ConfiguringTask, ContributedTask, CustomTask, DependsOrder, ExecutionEngine, InMemoryTask, InstancePolicy, JsonSchemaVersion, KeyedTaskIdentifier, PanelKind, PresentationOptions, RevealKind, RevealProblemKind, RunOnOptions, RunOptions, RuntimeType, ShellQuoting, TASKS_CATEGORY, TASK_RUNNING_STATE, TASK_TERMINAL_ACTIVE, TaskDefinition, TaskEvent, TaskEventKind, TaskGroup, TaskRunSource, TaskRunType, TaskScope, TaskSettingId, TaskSorter, TaskSourceKind, TasksSchemaProperties, USER_TASKS_GROUP_KEY };

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

@@ -6,7 +6,7 @@ import { DisposableStore, IDisposable, type IReference } from "../../../../base/
 import { OperatingSystem } from "../../../../base/common/platform.js";
 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 { IMarkProperties, ITerminalCapabilityStore, ITerminalCommand } from "@codingame/monaco-vscode-47472025-cc45-5680-86cd-09ceaba921a1-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, type ShellIntegrationInjectionFailureReason } from "../../../../platform/terminal/common/terminal.js";
 import { IColorTheme } from "../../../../platform/theme/common/themeService.js";

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

@@ -1,7 +1,7 @@
 import { Orientation } from "../../../../base/browser/ui/sash/sash.js";
 import { Event, DynamicListEventMultiplexer, IDynamicListEventMultiplexer } from "../../../../base/common/event.js";
 import { URI } from "../../../../base/common/uri.js";
-import { TerminalCapability, ITerminalCapabilityImplMap } from "@codingame/monaco-vscode-0b087f42-a5a3-5eb9-9bfd-1eebc1bba163-common/vscode/vs/platform/terminal/common/capabilities/capabilities";
+import { TerminalCapability, ITerminalCapabilityImplMap } from "@codingame/monaco-vscode-47472025-cc45-5680-86cd-09ceaba921a1-common/vscode/vs/platform/terminal/common/capabilities/capabilities";
 import { TerminalLocation, ITerminalBackend, ITerminalLaunchError, type IShellLaunchConfig, type ITerminalProfile } from "../../../../platform/terminal/common/terminal.js";
 import { GroupIdentifier } from "../../../common/editor.js";
 import { EditorInput } from "../../../common/editor/editorInput.js";

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

@@ -1,7 +1,7 @@
 import { Event } from "../../../../../base/common/event.js";
 import { IDisposable } from "../../../../../base/common/lifecycle.js";
 import { ITerminalCommandSelector } from "../../../../../platform/terminal/common/terminal.js";
-import { ITerminalQuickFixProviderSelector, ITerminalQuickFixProvider } from "@codingame/monaco-vscode-42931eb9-e564-530c-bafc-fa23ab43a070-common/vscode/vs/workbench/contrib/terminalContrib/quickFix/browser/quickFix";
+import { ITerminalQuickFixProviderSelector, ITerminalQuickFixProvider } from "@codingame/monaco-vscode-2a94c04a-b85b-5669-b06b-89c1bfa11cb9-common/vscode/vs/workbench/contrib/terminalContrib/quickFix/browser/quickFix";
 export declare const ITerminalQuickFixService: import("../../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<ITerminalQuickFixService>;
 export interface ITerminalQuickFixService {
     onDidRegisterProvider: Event<ITerminalQuickFixProviderSelector>;

package/vscode/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.service.d.ts

@@ -1,6 +1,6 @@
 import { CancellationToken } from "../../../../../base/common/cancellation.js";
 import { IDisposable } from "../../../../../base/common/lifecycle.js";
-import { ITerminalCapabilityStore } from "@codingame/monaco-vscode-0b087f42-a5a3-5eb9-9bfd-1eebc1bba163-common/vscode/vs/platform/terminal/common/capabilities/capabilities";
+import { ITerminalCapabilityStore } from "@codingame/monaco-vscode-47472025-cc45-5680-86cd-09ceaba921a1-common/vscode/vs/platform/terminal/common/capabilities/capabilities";
 import { TerminalShellType } from "../../../../../platform/terminal/common/terminal.js";
 import { ITerminalCompletion } from "@codingame/monaco-vscode-terminal-service-override/vscode/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionItem";
 import { ITerminalCompletionProvider } from "@codingame/monaco-vscode-terminal-service-override/vscode/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService";

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(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')),
+    [TestResultState.Errored]: ( localize(11310, 'Errored')),
+    [TestResultState.Failed]: ( localize(11311, 'Failed')),
+    [TestResultState.Passed]: ( localize(11312, 'Passed')),
+    [TestResultState.Queued]: ( localize(11313, 'Queued')),
+    [TestResultState.Running]: ( localize(11314, 'Running')),
+    [TestResultState.Skipped]: ( localize(11315, 'Skipped')),
+    [TestResultState.Unset]: ( localize(11316, 'Not yet run')),
 };
-const labelForTestInState = (label, state) => ( localize(11051, '{0} ({1})', stripIcons(label), testStateNames[state]));
+const labelForTestInState = (label, state) => ( localize(11317, '{0} ({1})', stripIcons(label), testStateNames[state]));
 const testConfigurationGroupNames = {
-    [TestRunProfileBitset.Debug]: ( localize(11052, 'Debug')),
-    [TestRunProfileBitset.Run]: ( localize(11053, 'Run')),
-    [TestRunProfileBitset.Coverage]: ( localize(11054, 'Coverage')),
+    [TestRunProfileBitset.Debug]: ( localize(11318, 'Debug')),
+    [TestRunProfileBitset.Run]: ( localize(11319, 'Run')),
+    [TestRunProfileBitset.Coverage]: ( localize(11320, 'Coverage')),
 };
 var TestCommandId;
 (function (TestCommandId) {