@codingame/monaco-vscode-api 22.1.9 → 23.0.0

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(10554, "{0} ({1})", snippet.description || snippet.name, snippet.source));
+        this.detail = ( localize(10807, "{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(
-                    10555,
+                    10808,
                     "{0}, {1}",
                     suggestions[to].label.label,
                     suggestions[to].snippet.name
                 ));
             }
             if (to > i + 1) {
-                suggestions[i].label.label = ( localize(10555, "{0}, {1}", suggestions[i].label.label, suggestions[i].snippet.name));
+                suggestions[i].label.label = ( localize(10808, "{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(10571, "Workspace Snippet"));
+            source = ( localize(10824, "Workspace Snippet"));
         }
         else {
             if (this.isGlobalSnippets) {
-                source = ( localize(10572, "Global User Snippet"));
+                source = ( localize(10825, "Global User Snippet"));
             }
             else {
-                source = ( localize(10573, "User Snippet"));
+                source = ( localize(10826, "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(
-                10574,
+                10827,
                 "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(
-                10575,
+                10828,
                 "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(
-                10576,
+                10829,
                 "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(
-                10577,
+                10830,
                 "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(10578, 'Contributes snippets.')),
+        description: ( localize(10831, '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(10579, 'Language identifier for which this snippet is contributed to.')),
+                    description: ( localize(10832, 'Language identifier for which this snippet is contributed to.')),
                     type: 'string'
                 },
                 path: {
                     description: ( localize(
-                        10580,
+                        10833,
                         '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(
-                                        10581,
+                                        10834,
                                         "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(
-                                    10582,
+                                    10835,
                                     "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(10586, "A speech provider is registered to the speech service.")) }));
+const HasSpeechProvider = ( new RawContextKey('hasSpeechProvider', false, { type: 'boolean', description: ( localize(10839, "A speech provider is registered to the speech service.")) }));
 const SpeechToTextInProgress = ( new RawContextKey(
     'speechToTextInProgress',
     false,
-    { type: 'boolean', description: ( localize(10587, "A speech-to-text session is in progress.")) }
+    { type: 'boolean', description: ( localize(10840, "A speech-to-text session is in progress.")) }
 ));
 const TextToSpeechInProgress = ( new RawContextKey(
     'textToSpeechInProgress',
     false,
-    { type: 'boolean', description: ( localize(10588, "A text-to-speech session is in progress.")) }
+    { type: 'boolean', description: ( localize(10841, "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(10589, "Danish (Denmark)"))
+        name: ( localize(10842, "Danish (Denmark)"))
     },
     ['de-DE']: {
-        name: ( localize(10590, "German (Germany)"))
+        name: ( localize(10843, "German (Germany)"))
     },
     ['en-AU']: {
-        name: ( localize(10591, "English (Australia)"))
+        name: ( localize(10844, "English (Australia)"))
     },
     ['en-CA']: {
-        name: ( localize(10592, "English (Canada)"))
+        name: ( localize(10845, "English (Canada)"))
     },
     ['en-GB']: {
-        name: ( localize(10593, "English (United Kingdom)"))
+        name: ( localize(10846, "English (United Kingdom)"))
     },
     ['en-IE']: {
-        name: ( localize(10594, "English (Ireland)"))
+        name: ( localize(10847, "English (Ireland)"))
     },
     ['en-IN']: {
-        name: ( localize(10595, "English (India)"))
+        name: ( localize(10848, "English (India)"))
     },
     ['en-NZ']: {
-        name: ( localize(10596, "English (New Zealand)"))
+        name: ( localize(10849, "English (New Zealand)"))
     },
     ['en-US']: {
-        name: ( localize(10597, "English (United States)"))
+        name: ( localize(10850, "English (United States)"))
     },
     ['es-ES']: {
-        name: ( localize(10598, "Spanish (Spain)"))
+        name: ( localize(10851, "Spanish (Spain)"))
     },
     ['es-MX']: {
-        name: ( localize(10599, "Spanish (Mexico)"))
+        name: ( localize(10852, "Spanish (Mexico)"))
     },
     ['fr-CA']: {
-        name: ( localize(10600, "French (Canada)"))
+        name: ( localize(10853, "French (Canada)"))
     },
     ['fr-FR']: {
-        name: ( localize(10601, "French (France)"))
+        name: ( localize(10854, "French (France)"))
     },
     ['hi-IN']: {
-        name: ( localize(10602, "Hindi (India)"))
+        name: ( localize(10855, "Hindi (India)"))
     },
     ['it-IT']: {
-        name: ( localize(10603, "Italian (Italy)"))
+        name: ( localize(10856, "Italian (Italy)"))
     },
     ['ja-JP']: {
-        name: ( localize(10604, "Japanese (Japan)"))
+        name: ( localize(10857, "Japanese (Japan)"))
     },
     ['ko-KR']: {
-        name: ( localize(10605, "Korean (South Korea)"))
+        name: ( localize(10858, "Korean (South Korea)"))
     },
     ['nl-NL']: {
-        name: ( localize(10606, "Dutch (Netherlands)"))
+        name: ( localize(10859, "Dutch (Netherlands)"))
     },
     ['pt-PT']: {
-        name: ( localize(10607, "Portuguese (Portugal)"))
+        name: ( localize(10860, "Portuguese (Portugal)"))
     },
     ['pt-BR']: {
-        name: ( localize(10608, "Portuguese (Brazil)"))
+        name: ( localize(10861, "Portuguese (Brazil)"))
     },
     ['ru-RU']: {
-        name: ( localize(10609, "Russian (Russia)"))
+        name: ( localize(10862, "Russian (Russia)"))
     },
     ['sv-SE']: {
-        name: ( localize(10610, "Swedish (Sweden)"))
+        name: ( localize(10863, "Swedish (Sweden)"))
     },
     ['tr-TR']: {
-        name: ( localize(10611, "Turkish (Türkiye)"))
+        name: ( localize(10864, "Turkish (Türkiye)"))
     },
     ['zh-CN']: {
-        name: ( localize(10612, "Chinese (Simplified, China)"))
+        name: ( localize(10865, "Chinese (Simplified, China)"))
     },
     ['zh-HK']: {
-        name: ( localize(10613, "Chinese (Traditional, Hong Kong)"))
+        name: ( localize(10866, "Chinese (Traditional, Hong Kong)"))
     },
     ['zh-TW']: {
-        name: ( localize(10614, "Chinese (Traditional, Taiwan)"))
+        name: ( localize(10867, "Chinese (Traditional, Taiwan)"))
     }
 };
 function speechLanguageConfigToLanguage(config, lang = language) {

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

@@ -3,7 +3,7 @@ import { Codicon } from '../../../../base/common/codicons.js';
 import { localize } from '../../../../nls.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 
-const rerunTaskIcon = registerIcon('rerun-task', Codicon.refresh, ( localize(10823, 'View icon of the rerun task.')));
+const rerunTaskIcon = registerIcon('rerun-task', Codicon.refresh, ( localize(11076, 'View icon of the rerun task.')));
 const RerunForActiveTerminalCommandId = 'workbench.action.tasks.rerunForActiveTerminal';
 const RerunAllRunningTasksCommandId = 'workbench.action.tasks.rerunAllRunningTasks';
 

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

@@ -6,6 +6,6 @@ export interface ITaskDefinitionRegistry {
     get(key: string): Tasks.ITaskDefinition;
     all(): Tasks.ITaskDefinition[];
     getJsonSchema(): IJSONSchema;
-    onDefinitionsChanged: Event<void>;
+    readonly onDefinitionsChanged: Event<void>;
 }
 export declare const TaskDefinitionRegistry: ITaskDefinitionRegistry;

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

@@ -13,7 +13,7 @@ const taskDefinitionSchema = {
         type: {
             type: 'string',
             description: ( localize(
-                11031,
+                11284,
                 '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(11032, 'Additional properties of the task type')),
+            description: ( localize(11285, '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(
-                11033,
+                11286,
                 '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(
-                11034,
+                11287,
                 'The task type configuration is missing the required \'taskType\' property'
             )));
             return undefined;
@@ -81,7 +81,7 @@ const taskDefinitionsExtPoint = ExtensionsRegistry.registerExtensionPoint({
         }
     },
     jsonSchema: {
-        description: ( localize(11035, 'Contributes task kinds')),
+        description: ( localize(11288, 'Contributes task kinds')),
         type: 'array',
         items: taskDefinitionSchema
     }

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

@@ -1,6 +1,7 @@
 import { Action } from "../../../../base/common/actions.js";
 import { Event } from "../../../../base/common/event.js";
 import { IDisposable } from "../../../../base/common/lifecycle.js";
+import { SingleOrMany } from "../../../../base/common/types.js";
 import { URI } from "../../../../base/common/uri.js";
 import { IMarkerData } from "../../../../platform/markers/common/markers.js";
 import { IWorkspace, IWorkspaceFolder } from "../../../../platform/workspace/common/workspace.js";
@@ -10,11 +11,11 @@ import { ITaskSummary, ITaskTerminateResponse, ITaskSystemInfo } from "@codingam
 export declare const ITaskService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<ITaskService>;
 export interface ITaskService {
     readonly _serviceBrand: undefined;
-    onDidStateChange: Event<ITaskEvent>;
+    readonly onDidStateChange: Event<ITaskEvent>;
     /** Fired when task providers are registered or unregistered */
-    onDidChangeTaskProviders: Event<void>;
+    readonly onDidChangeTaskProviders: Event<void>;
     isReconnected: boolean;
-    onDidReconnectToTasks: Event<void>;
+    readonly onDidReconnectToTasks: Event<void>;
     supportsMultipleTaskExecutions: boolean;
     configureAction(): Action;
     run(task: Task | undefined, options?: IProblemMatcherRunOptions, runSource?: TaskRunSource): Promise<ITaskSummary | undefined>;
@@ -33,7 +34,7 @@ export interface ITaskService {
     getWorkspaceTasks(runSource?: TaskRunSource): Promise<Map<string, IWorkspaceFolderTaskResult>>;
     getSavedTasks(type: "persistent" | "historical"): Promise<(Task | ConfiguringTask)[]>;
     removeRecentlyUsedTask(taskRecentlyUsedKey: string): void;
-    getTerminalsForTasks(tasks: Task | Task[]): URI[] | undefined;
+    getTerminalsForTasks(tasks: SingleOrMany<Task>): URI[] | undefined;
     getTaskProblems(instanceId: number): Map<string, {
         resources: URI[];
         markers: IMarkerData[];
@@ -49,8 +50,8 @@ export interface ITaskService {
     openConfig(task: CustomTask | ConfiguringTask | undefined): Promise<boolean>;
     registerTaskProvider(taskProvider: ITaskProvider, type: string): IDisposable;
     registerTaskSystem(scheme: string, taskSystemInfo: ITaskSystemInfo): void;
-    onDidChangeTaskSystemInfo: Event<void>;
-    onDidChangeTaskConfig: Event<void>;
+    readonly onDidChangeTaskSystemInfo: Event<void>;
+    readonly onDidChangeTaskConfig: Event<void>;
     readonly hasTaskSystemInfo: boolean;
     registerSupportedExecutions(custom?: boolean, shell?: boolean, process?: boolean): void;
     extensionCallbackTaskComplete(task: Task, result: number | undefined): Promise<void>;

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

@@ -1,4 +1,5 @@
 import * as nls from "../../../../nls.js";
+import * as Types from "../../../../base/common/types.js";
 import { IJSONSchemaMap } from "../../../../base/common/jsonSchema.js";
 import { UriComponents, URI } from "../../../../base/common/uri.js";
 import { ProblemMatcher } from "@codingame/monaco-vscode-task-service-override/vscode/vs/workbench/contrib/tasks/common/problemMatcher";
@@ -268,6 +269,17 @@ export interface ITaskSourceConfigElement {
     index: number;
     element: any;
 }
+export interface ITaskConfig {
+    label: string;
+    task?: CommandString;
+    type?: string;
+    command?: string | CommandString;
+    args?: string[] | CommandString[];
+    presentation?: IPresentationOptions;
+    isBackground?: boolean;
+    problemMatcher?: Types.SingleOrMany<string>;
+    group?: string | TaskGroup;
+}
 interface IBaseTaskSource {
     readonly kind: string;
     readonly label: string;

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

@@ -9,9 +9,9 @@ import { ConfigurationTarget } from '../../../../platform/configuration/common/c
 export { RerunAllRunningTasksCommandId, RerunForActiveTerminalCommandId, rerunTaskIcon } from './constants.js';
 
 const USER_TASKS_GROUP_KEY = 'settings';
-const TASK_RUNNING_STATE = ( new RawContextKey('taskRunning', false, ( localize(11046, "Whether a task is currently running."))));
-const TASK_TERMINAL_ACTIVE = ( new RawContextKey('taskTerminalActive', false, ( localize(11047, "Whether the active terminal is a task terminal."))));
-const TASKS_CATEGORY = ( localize2(11048, "Tasks"));
+const TASK_RUNNING_STATE = ( new RawContextKey('taskRunning', false, ( localize(11299, "Whether a task is currently running."))));
+const TASK_TERMINAL_ACTIVE = ( new RawContextKey('taskTerminalActive', false, ( localize(11300, "Whether the active terminal is a task terminal."))));
+const TASKS_CATEGORY = ( localize2(11301, "Tasks"));
 var ShellQuoting;
 (function (ShellQuoting) {
     ShellQuoting[ShellQuoting["Escape"] = 1] = "Escape";
@@ -794,7 +794,7 @@ var TaskDefinition;
                             break;
                         default:
                             reporter.error(( localize(
-                                11049,
+                                11302,
                                 '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

@@ -4,9 +4,9 @@ import { Color } from "../../../../base/common/color.js";
 import { Event } from "../../../../base/common/event.js";
 import { DisposableStore, IDisposable, type IReference } from "../../../../base/common/lifecycle.js";
 import { OperatingSystem } from "../../../../base/common/platform.js";
-import { URI } from "../../../../base/common/uri.js";
+import { URI, UriComponents } from "../../../../base/common/uri.js";
 import { IKeyMods } from "../../../../platform/quickinput/common/quickInput.js";
-import { IMarkProperties, ITerminalCapabilityStore, ITerminalCommand } from "@codingame/monaco-vscode-a9da9abe-278d-5ce6-9418-99c7c07c5c37-common/vscode/vs/platform/terminal/common/capabilities/capabilities";
+import { IMarkProperties, ITerminalCapabilityStore, ITerminalCommand } from "@codingame/monaco-vscode-10af0e5d-64cb-56de-b584-29ab4a355d15-common/vscode/vs/platform/terminal/common/capabilities/capabilities";
 import { IMergedEnvironmentVariableCollection } from "@codingame/monaco-vscode-07eaa805-9dea-5ec6-a422-a4f04872424d-common/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";
@@ -19,11 +19,12 @@ import { ScrollPosition } from "@codingame/monaco-vscode-88141f48-1af9-57ef-a278
 import { IContextKeyService } from "../../../../platform/contextkey/common/contextkey.service.js";
 import { GroupIdentifier } from "../../../common/editor.js";
 import { ACTIVE_GROUP_TYPE, AUX_WINDOW_GROUP_TYPE, SIDE_GROUP_TYPE } from "../../../services/editor/common/editorService.js";
-import type { ICurrentPartialCommand } from "@codingame/monaco-vscode-88141f48-1af9-57ef-a278-f4b2ff6128fa-common/vscode/vs/platform/terminal/common/capabilities/commandDetection/terminalCommand";
+import type { ICurrentPartialCommand } from "@codingame/monaco-vscode-45e04ac3-b807-5ae5-8818-7b9c40b6d31f-common/vscode/vs/platform/terminal/common/capabilities/commandDetection/terminalCommand";
 import type { IMenu } from "../../../../platform/actions/common/actions.js";
-import type { Barrier } from "../../../../base/common/async.js";
 import type { IProgressState } from "@xterm/addon-progress";
 import type { IEditorOptions } from "../../../../platform/editor/common/editor.js";
+import type { MaybePromise } from "../../../../base/common/async.js";
+import type { SingleOrMany } from "../../../../base/common/types.js";
 /**
  * A terminal contribution that gets created whenever a terminal is created. A contribution has
  * access to the process manager through the constructor and provides a method for when xterm.js has
@@ -39,11 +40,9 @@ export interface ITerminalContribution extends IDisposable {
     xtermReady?(xterm: IXtermTerminal & {
         raw: RawXtermTerminal;
     }): void;
-    handleMouseEvent?(event: MouseEvent): Promise<{
+    handleMouseEvent?(event: MouseEvent): MaybePromise<{
         handled: boolean;
-    } | void> | {
-        handled: boolean;
-    } | void;
+    } | void>;
 }
 export declare enum Direction {
     Left = 0,
@@ -71,7 +70,7 @@ export interface IMarkTracker {
     clear(): void;
     scrollToClosestMarker(startMarkerId: string, endMarkerId?: string, highlight?: boolean | undefined): void;
     scrollToLine(line: number, position: ScrollPosition): void;
-    revealCommand(command: ITerminalCommand | ICurrentPartialCommand, position?: ScrollPosition): void;
+    revealCommand(command: ITerminalCommand | ICurrentPartialCommand | URI, position?: ScrollPosition): void;
     revealRange(range: IBufferRange): void;
     registerTemporaryDecoration(marker: IMarker, endMarker: IMarker | undefined, showOutline: boolean): void;
     showCommandGuide(command: ITerminalCommand | undefined): void;
@@ -95,7 +94,7 @@ export interface ITerminalGroup {
     attachToElement(element: HTMLElement): void;
     addInstance(instance: ITerminalInstance): void;
     removeInstance(instance: ITerminalInstance): void;
-    moveInstance(instances: ITerminalInstance | ITerminalInstance[], index: number, position: "before" | "after"): void;
+    moveInstance(instances: SingleOrMany<ITerminalInstance>, index: number, position: "before" | "after"): void;
     setVisible(visible: boolean): void;
     layout(width: number, height: number): void;
     addDisposable(disposable: IDisposable): void;
@@ -202,7 +201,7 @@ export interface ISerializedTerminalEditorInput extends ITerminalEditorInputObje
 export interface IDeserializedTerminalEditorInput extends ITerminalEditorInputObject {
 }
 export type ITerminalLocationOptions = TerminalLocation | TerminalEditorLocation | {
-    parentTerminal: Promise<ITerminalInstance> | ITerminalInstance;
+    parentTerminal: MaybePromise<ITerminalInstance>;
 } | {
     splitActiveTerminal: boolean;
 };
@@ -261,7 +260,7 @@ export interface ITerminalInstanceHost {
      * Gets an instance from a resource if it exists. This MUST be used instead of getInstanceFromId
      * when you only know about a terminal's URI. (a URI's instance ID may not be this window's instance ID)
      */
-    getInstanceFromResource(resource: URI | undefined): ITerminalInstance | undefined;
+    getInstanceFromResource(resource: UriComponents | undefined): ITerminalInstance | undefined;
 }
 /**
  * Similar to xterm.js' ILinkProvider but using promises and hides xterm.js internals (like buffer
@@ -359,7 +358,7 @@ export interface ITerminalInstance extends IBaseTerminalInstance {
     /**
      * Whether the terminal's pty is hosted on a remote.
      */
-    readonly isRemote: boolean;
+    readonly hasRemoteAuthority: boolean;
     /**
      * The remote authority of the terminal's pty.
      */
@@ -380,48 +379,48 @@ export interface ITerminalInstance extends IBaseTerminalInstance {
     /**
      * An event that fires when the terminal instance's title changes.
      */
-    onTitleChanged: Event<ITerminalInstance>;
+    readonly onTitleChanged: Event<ITerminalInstance>;
     /**
      * An event that fires when the terminal instance's icon changes.
      */
-    onIconChanged: Event<{
+    readonly onIconChanged: Event<{
         instance: ITerminalInstance;
         userInitiated: boolean;
     }>;
     /**
      * An event that fires when the terminal instance is disposed.
      */
-    onDisposed: Event<ITerminalInstance>;
-    onProcessIdReady: Event<ITerminalInstance>;
-    onProcessReplayComplete: Event<void>;
-    onRequestExtHostProcess: Event<ITerminalInstance>;
-    onDimensionsChanged: Event<void>;
-    onMaximumDimensionsChanged: Event<void>;
-    onDidChangeHasChildProcesses: Event<boolean>;
-    onDidFocus: Event<ITerminalInstance>;
-    onDidRequestFocus: Event<void>;
-    onDidBlur: Event<ITerminalInstance>;
-    onDidInputData: Event<string>;
-    onDidChangeSelection: Event<ITerminalInstance>;
-    onDidExecuteText: Event<void>;
-    onDidChangeTarget: Event<TerminalLocation | undefined>;
-    onDidSendText: Event<string>;
-    onDidChangeShellType: Event<TerminalShellType>;
-    onDidChangeVisibility: Event<boolean>;
+    readonly onDisposed: Event<ITerminalInstance>;
+    readonly onProcessIdReady: Event<ITerminalInstance>;
+    readonly onProcessReplayComplete: Event<void>;
+    readonly onRequestExtHostProcess: Event<ITerminalInstance>;
+    readonly onDimensionsChanged: Event<void>;
+    readonly onMaximumDimensionsChanged: Event<void>;
+    readonly onDidChangeHasChildProcesses: Event<boolean>;
+    readonly onDidFocus: Event<ITerminalInstance>;
+    readonly onDidRequestFocus: Event<void>;
+    readonly onDidBlur: Event<ITerminalInstance>;
+    readonly onDidInputData: Event<string>;
+    readonly onDidChangeSelection: Event<ITerminalInstance>;
+    readonly onDidExecuteText: Event<void>;
+    readonly onDidChangeTarget: Event<TerminalLocation | undefined>;
+    readonly onDidSendText: Event<string>;
+    readonly onDidChangeShellType: Event<TerminalShellType>;
+    readonly onDidChangeVisibility: Event<boolean>;
     /**
      * An event that fires when a terminal is dropped on this instance via drag and drop.
      */
-    onRequestAddInstanceToGroup: Event<IRequestAddInstanceToGroupEvent>;
+    readonly onRequestAddInstanceToGroup: Event<IRequestAddInstanceToGroupEvent>;
     /**
      * Attach a listener to the raw data stream coming from the pty, including ANSI escape
      * sequences.
      */
-    onData: Event<string>;
-    onWillData: Event<string>;
+    readonly onData: Event<string>;
+    readonly onWillData: Event<string>;
     /**
      * Attach a listener to the binary data stream coming from xterm and going to pty
      */
-    onBinary: Event<string>;
+    readonly onBinary: Event<string>;
     /**
      * Attach a listener to listen for new lines added to this terminal instance.
      *
@@ -432,13 +431,13 @@ export interface ITerminalInstance extends IBaseTerminalInstance {
      * is exited. The lineData string will contain the fully wrapped line, not containing any LF/CR
      * characters.
      */
-    onLineData: Event<string>;
+    readonly onLineData: Event<string>;
     /**
      * Attach a listener that fires when the terminal's pty process exits. The number in the event
      * is the processes' exit code, an exit code of undefined means the process was killed as a result of
      * the ITerminalInstance being disposed.
      */
-    onExit: Event<number | ITerminalLaunchError | undefined>;
+    readonly onExit: Event<number | ITerminalLaunchError | undefined>;
     /**
      * The exit code or undefined when the terminal process hasn't yet exited or
      * the process exit code could not be determined. Use {@link exitReason} to see
@@ -585,7 +584,7 @@ export interface ITerminalInstance extends IBaseTerminalInstance {
      * The character(s) added are \n or \r\n, depending on the platform. This defaults to `true`.
      */
     sendPath(originalPath: string | URI, shouldExecute: boolean): Promise<void>;
-    runCommand(command: string, shouldExecute?: boolean): Promise<void>;
+    runCommand(command: string, shouldExecute?: boolean, commandId?: string): Promise<void>;
     /**
      * Takes a path and returns the properly escaped path to send to a given shell. On Windows, this
      * includes trying to prepare the path for WSL if needed.
@@ -593,6 +592,11 @@ export interface ITerminalInstance extends IBaseTerminalInstance {
      * @param originalPath The path to be escaped and formatted.
      */
     preparePathForShell(originalPath: string): Promise<string>;
+    /**
+     * Formats a file system URI for display in UI so that it appears in the terminal shell's format.
+     * @param uri The URI to format.
+     */
+    getUriLabelForShell(uri: URI): Promise<string>;
     /** Scroll the terminal buffer down 1 line. */ scrollDownLine(): void;
     /** Scroll the terminal buffer down 1 page. */ scrollDownPage(): void;
     /** Scroll the terminal buffer to the bottom. */ scrollToBottom(): void;
@@ -701,11 +705,6 @@ export interface ITerminalInstance extends IBaseTerminalInstance {
     handleMouseEvent(event: MouseEvent, contextMenu: IMenu): Promise<{
         cancelContextMenu: boolean;
     } | void>;
-    /**
-     * Pause input events until the provided barrier is resolved.
-     * @param barrier The barrier to wait for until input events can continue.
-     */
-    pauseInputEvents(barrier: Barrier): void;
 }
 export declare enum XtermTerminalConstants {
     SearchHighlightLimit = 20000