@codingame/monaco-vscode-extensions-service-override 30.0.1 → 31.0.1

package/vscode/src/vs/workbench/api/browser/mainThreadFileSystemEventService.js

@@ -94,25 +94,25 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
                     if (data.extensionNames.length === 1) {
                         if (operation === FileOperation.CREATE) {
                             message = ( localize(
-                                2571,
+                                2566,
                                 "Extension '{0}' wants to make refactoring changes with this file creation",
                                 data.extensionNames[0]
                             ));
                         } else if (operation === FileOperation.COPY) {
                             message = ( localize(
-                                2572,
+                                2567,
                                 "Extension '{0}' wants to make refactoring changes with this file copy",
                                 data.extensionNames[0]
                             ));
                         } else if (operation === FileOperation.MOVE) {
                             message = ( localize(
-                                2573,
+                                2568,
                                 "Extension '{0}' wants to make refactoring changes with this file move",
                                 data.extensionNames[0]
                             ));
                         } else  {
                             message = ( localize(
-                                2574,
+                                2569,
                                 "Extension '{0}' wants to make refactoring changes with this file deletion",
                                 data.extensionNames[0]
                             ));
@@ -120,25 +120,25 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
                     } else {
                         if (operation === FileOperation.CREATE) {
                             message = ( localize(
-                                2575,
+                                2570,
                                 "{0} extensions want to make refactoring changes with this file creation",
                                 data.extensionNames.length
                             ));
                         } else if (operation === FileOperation.COPY) {
                             message = ( localize(
-                                2576,
+                                2571,
                                 "{0} extensions want to make refactoring changes with this file copy",
                                 data.extensionNames.length
                             ));
                         } else if (operation === FileOperation.MOVE) {
                             message = ( localize(
-                                2577,
+                                2572,
                                 "{0} extensions want to make refactoring changes with this file move",
                                 data.extensionNames.length
                             ));
                         } else  {
                             message = ( localize(
-                                2578,
+                                2573,
                                 "{0} extensions want to make refactoring changes with this file deletion",
                                 data.extensionNames.length
                             ));
@@ -150,8 +150,8 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
                         } = await dialogService.confirm({
                             type: Severity.Info,
                             message,
-                            primaryButton: ( localize(2579, "Show &&Preview")),
-                            cancelButton: ( localize(2580, "Skip Changes"))
+                            primaryButton: ( localize(2574, "Show &&Preview")),
+                            cancelButton: ( localize(2575, "Skip Changes"))
                         });
                         showPreview = true;
                         if (!confirmed) {
@@ -171,18 +171,18 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
                             type: Severity.Info,
                             message,
                             buttons: [{
-                                label: ( localize(2581, "&&OK")),
+                                label: ( localize(2576, "&&OK")),
                                 run: () => Choice.OK
                             }, {
-                                label: ( localize(2579, "Show &&Preview")),
+                                label: ( localize(2574, "Show &&Preview")),
                                 run: () => Choice.Preview
                             }],
                             cancelButton: {
-                                label: ( localize(2580, "Skip Changes")),
+                                label: ( localize(2575, "Skip Changes")),
                                 run: () => Choice.Cancel
                             },
                             checkbox: {
-                                label: ( localize(2582, "Do not ask me again"))
+                                label: ( localize(2577, "Do not ask me again"))
                             }
                         });
                         if (result === Choice.Cancel) {
@@ -211,15 +211,15 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
             _progressLabel(operation) {
                 switch (operation) {
                 case FileOperation.CREATE:
-                    return localize(2583, "Running 'File Create' participants...");
+                    return localize(2578, "Running 'File Create' participants...");
                 case FileOperation.MOVE:
-                    return localize(2584, "Running 'File Rename' participants...");
+                    return localize(2579, "Running 'File Rename' participants...");
                 case FileOperation.COPY:
-                    return localize(2585, "Running 'File Copy' participants...");
+                    return localize(2580, "Running 'File Copy' participants...");
                 case FileOperation.DELETE:
-                    return localize(2586, "Running 'File Delete' participants...");
+                    return localize(2581, "Running 'File Delete' participants...");
                 case FileOperation.WRITE:
-                    return localize(2587, "Running 'File Write' participants...");
+                    return localize(2582, "Running 'File Write' participants...");
                 }
             }
         })();
@@ -307,7 +307,7 @@ registerAction2(class ResetMemento extends Action2 {
         super({
             id: "files.participants.resetChoice",
             title: {
-                value: ( localize(2588, "Reset choice for 'File operation needs preview'")),
+                value: ( localize(2583, "Reset choice for 'File operation needs preview'")),
                 original: `Reset choice for 'File operation needs preview'`
             },
             f1: true

package/vscode/src/vs/workbench/api/browser/mainThreadGitExtensionService.d.ts

@@ -14,7 +14,6 @@ export declare class MainThreadGitExtensionService extends Disposable implements
     get repositories(): Iterable<IGitRepository>;
     constructor(extHostContext: IExtHostContext, gitService: IGitService);
     private _initializeDelegate;
-    private _getRepositoryByUri;
     openRepository(uri: URI): Promise<IGitRepository | undefined>;
     getRefs(root: URI, query: GitRefQuery, token?: CancellationToken): Promise<GitRef[]>;
     diffBetweenWithStats(root: URI, ref1: string, ref2: string, path?: string): Promise<GitDiffChange[]>;

package/vscode/src/vs/workbench/api/browser/mainThreadGitExtensionService.js

@@ -3,12 +3,14 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { Sequencer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { ResourceMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { GitRepository } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/git/browser/gitService';
 import { GitRefType } from '../../contrib/git/common/gitService.js';
 import { IGitService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/git/common/gitService.service';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { GitRefTypeDto, ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
+import { waitForState } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils/utilsCancellation';
 
 function toGitRefType(type) {
     switch (type) {
@@ -38,11 +40,11 @@ function toGitRepositoryState(dto) {
             name: dto.HEAD.name,
             commit: dto.HEAD.commit,
             remote: dto.HEAD.remote,
-            base: dto.HEAD.base,
             upstream: dto.HEAD.upstream,
             ahead: dto.HEAD.ahead,
             behind: dto.HEAD.behind
         } : undefined,
+        remotes: dto?.remotes ?? [],
         mergeChanges: dto?.mergeChanges?.map(c => ({
             uri: URI.revive(c.uri),
             originalUri: c.originalUri ? URI.revive(c.originalUri) : undefined,
@@ -84,29 +86,18 @@ let MainThreadGitExtensionService = class MainThreadGitExtensionService extends
             this._register(this.gitService.setDelegate(this));
         }
     }
-    _getRepositoryByUri(uri) {
-        const handle = this._repositoryHandles.get(uri);
-        return handle !== undefined ? this._repositories.get(handle) : undefined;
-    }
     async openRepository(uri) {
         return this._openRepositorySequencer.queue(async () => {
-            const existingRepository = this._getRepositoryByUri(uri);
-            if (existingRepository) {
-                return existingRepository;
-            }
             const result = await this._proxy.$openRepository(uri);
             if (!result) {
                 return undefined;
             }
             const repositoryRootUri = URI.revive(result.rootUri);
-            const existingRepositoryForRoot = this._getRepositoryByUri(repositoryRootUri);
-            if (existingRepositoryForRoot) {
-                return existingRepositoryForRoot;
-            }
             const state = toGitRepositoryState(result.state);
             const repository = ( new GitRepository(repositoryRootUri, state, this));
             this._repositories.set(result.handle, repository);
             this._repositoryHandles.set(repositoryRootUri, result.handle);
+            await waitForState(repository.state, state => state.HEAD !== undefined);
             return repository;
         });
     }

package/vscode/src/vs/workbench/api/browser/mainThreadLanguageModels.js

@@ -178,7 +178,7 @@ let MainThreadLanguageModels = class MainThreadLanguageModels {
         if (this._authenticationService.getProviderIds().includes(authProviderId)) {
             return Disposable.None;
         }
-        const accountLabel = auth.accountLabel ?? ( localize(2589, "Language Models"));
+        const accountLabel = auth.accountLabel ?? ( localize(2584, "Language Models"));
         const disposables = ( new DisposableStore());
         const provider = ( new LanguageModelAccessAuthProvider(authProviderId, auth.providerLabel, accountLabel));
         this._authenticationService.registerAuthenticationProvider(authProviderId, provider);
@@ -261,7 +261,7 @@ class LanguageModelAccessAuthProvider {
     }
     confirmation(extensionName, _recreatingSession) {
         return localize(
-            2590,
+            2585,
             "The extension '{0}' wants to access the language models provided by {1}.",
             extensionName,
             this.label

package/vscode/src/vs/workbench/api/browser/mainThreadMcp.d.ts

@@ -1,5 +1,5 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import { URI, UriComponents } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
 import { IDialogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service";
 import { LogLevel } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log";
@@ -43,12 +43,12 @@ export declare class MainThreadMcp extends Disposable implements MainThreadMcpSh
     $onDidPublishLog(id: number, level: LogLevel, log: string): void;
     $onDidReceiveMessage(id: number, message: string): void;
     $getTokenForProviderId(id: number, providerId: string, scopes: string[], options?: IMcpAuthenticationOptions): Promise<string | undefined>;
-    $getTokenFromServerMetadata(id: number, authDetails: IMcpAuthenticationDetails, { errorOnUserInteraction, forceNewRegistration }?: IMcpAuthenticationOptions): Promise<string | undefined>;
+    $getTokenFromServerMetadata(id: number, authDetails: IMcpAuthenticationDetails, { errorOnUserInteraction, forceNewRegistration, clientId }?: IMcpAuthenticationOptions): Promise<string | undefined>;
     private _getSessionForProvider;
     private continueWithIncorrectAccountPrompt;
     private _onDidChangeAuthSessions;
     $logMcpAuthSetup(data: IAuthMetadataSource): void;
-    $startMcpGateway(): Promise<{
+    $startMcpGateway(chatSessionResource?: UriComponents): Promise<{
         servers: {
             label: string;
             address: URI;

package/vscode/src/vs/workbench/api/browser/mainThreadMcp.js

@@ -208,14 +208,23 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
         if (!server) {
             return undefined;
         }
-        return this._getSessionForProvider(id, server, providerId, scopes, undefined, options.errorOnUserInteraction);
+        return this._getSessionForProvider(
+            id,
+            server,
+            providerId,
+            scopes,
+            undefined,
+            options.errorOnUserInteraction,
+            options.clientId
+        );
     }
     async $getTokenFromServerMetadata(
         id,
         authDetails,
         {
             errorOnUserInteraction,
-            forceNewRegistration
+            forceNewRegistration,
+            clientId
         } = {}
     ) {
         const server = this._serverDefinitions.get(id);
@@ -238,7 +247,8 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
             const provider = await this._authenticationService.createDynamicAuthenticationProvider(
                 authorizationServer,
                 authDetails.authorizationServerMetadata,
-                authDetails.resourceMetadata
+                authDetails.resourceMetadata,
+                authDetails.clientId
             );
             if (!provider) {
                 return undefined;
@@ -251,7 +261,8 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
             providerId,
             resolvedScopes,
             authorizationServer,
-            errorOnUserInteraction
+            errorOnUserInteraction,
+            clientId ?? authDetails.clientId
         );
     }
     async _getSessionForProvider(
@@ -260,10 +271,12 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
         providerId,
         scopes,
         authorizationServer,
-        errorOnUserInteraction = false
+        errorOnUserInteraction = false,
+        clientId
     ) {
         const sessions = await this._authenticationService.getSessions(providerId, scopes, {
-            authorizationServer
+            authorizationServer,
+            clientId
         }, true);
         const accountNamePreference = this.authenticationMcpServersService.getAccountPreference(server.id, providerId);
         let matchingAccountPreferenceSession;
@@ -311,7 +324,8 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
                 session = await this._authenticationService.createSession(providerId, scopes, {
                     activateImmediate: true,
                     account: accountToCreate,
-                    authorizationServer
+                    authorizationServer,
+                    clientId
                 });
             } while (accountToCreate && accountToCreate.label !== session.account.label && !(await this.continueWithIncorrectAccountPrompt(session.account.label, accountToCreate.label)));
         }
@@ -327,9 +341,9 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
     }
     async continueWithIncorrectAccountPrompt(chosenAccountLabel, requestedAccountLabel) {
         const result = await this.dialogService.prompt({
-            message: ( localize(2591, "Incorrect account detected")),
+            message: ( localize(2586, "Incorrect account detected")),
             detail: ( localize(
-                2592,
+                2587,
                 "The chosen account, {0}, does not match the requested account, {1}.",
                 chosenAccountLabel,
                 requestedAccountLabel
@@ -337,10 +351,10 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
             type: Severity.Warning,
             cancelButton: true,
             buttons: [{
-                label: ( localize(2593, "Keep {0}", chosenAccountLabel)),
+                label: ( localize(2588, "Keep {0}", chosenAccountLabel)),
                 run: () => chosenAccountLabel
             }, {
-                label: ( localize(2594, "Login with {0}", requestedAccountLabel)),
+                label: ( localize(2589, "Login with {0}", requestedAccountLabel)),
                 run: () => requestedAccountLabel
             }]
         });
@@ -372,7 +386,7 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
             } catch (e) {
                 if (UserInteractionRequiredError.is(e)) {
                     server.pushLog(LogLevel.Warning, ( localize(
-                        2595,
+                        2590,
                         "Authentication session for {0} removed, stopping server",
                         providerLabel
                     )));
@@ -384,8 +398,11 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
     $logMcpAuthSetup(data) {
         this._telemetryService.publicLog2("mcp/authSetup", data);
     }
-    async $startMcpGateway() {
-        const result = await this._mcpGatewayService.createGateway(this._extHostContext.extensionHostKind === ExtensionHostKind.Remote);
+    async $startMcpGateway(chatSessionResource) {
+        const result = await this._mcpGatewayService.createGateway(
+            this._extHostContext.extensionHostKind === ExtensionHostKind.Remote,
+            chatSessionResource ? URI.revive(chatSessionResource) : undefined
+        );
         if (!result) {
             return undefined;
         }
@@ -416,18 +433,18 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
     }
     async loginPrompt(mcpLabel, providerLabel, recreatingSession) {
         const message = recreatingSession ? ( localize(
-            2596,
+            2591,
             "The MCP Server Definition '{0}' wants you to authenticate to {1}.",
             mcpLabel,
             providerLabel
         )) : ( localize(
-            2597,
+            2592,
             "The MCP Server Definition '{0}' wants to authenticate to {1}.",
             mcpLabel,
             providerLabel
         ));
         const buttons = [{
-            label: ( localize(2598, "&&Allow")),
+            label: ( localize(2593, "&&Allow")),
             run() {
                 return true;
             }

package/vscode/src/vs/workbench/api/browser/mainThreadMessageService.js

@@ -66,13 +66,13 @@ let MainThreadMessageService = class MainThreadMessageService {
                 sourceIsUrgent = MainThreadMessageService_1.URGENT_NOTIFICATION_SOURCES.includes(source.id);
             }
             if (!source) {
-                source = ( localize(2599, "Extension"));
+                source = ( localize(2594, "Extension"));
             }
             const secondaryActions = [];
             if (options.source) {
                 secondaryActions.push(toAction({
                     id: options.source.identifier.value,
-                    label: ( localize(2600, "Manage Extension")),
+                    label: ( localize(2595, "Manage Extension")),
                     run: () => {
                         return this._commandService.executeCommand("_extensions.manage", options.source.identifier.value);
                     }
@@ -111,12 +111,12 @@ let MainThreadMessageService = class MainThreadMessageService {
         if (!cancelButton) {
             if (buttons.length > 0) {
                 cancelButton = {
-                    label: ( localize(2601, "Cancel")),
+                    label: ( localize(2596, "Cancel")),
                     run: () => undefined
                 };
             } else {
                 cancelButton = {
-                    label: ( localize(2602, "&&OK")),
+                    label: ( localize(2597, "&&OK")),
                     run: () => undefined
                 };
             }

package/vscode/src/vs/workbench/api/browser/mainThreadNotebookSaveParticipant.js

@@ -18,7 +18,7 @@ class ExtHostNotebookDocumentSaveParticipant {
         }
         let _warningTimeout;
         const p = ( new Promise((resolve, reject) => {
-            _warningTimeout = setTimeout(() => reject(( new Error(( localize(2603, "Aborted onWillSaveNotebookDocument-event after 1750ms"))))), 1750);
+            _warningTimeout = setTimeout(() => reject(( new Error(( localize(2598, "Aborted onWillSaveNotebookDocument-event after 1750ms"))))), 1750);
             this._proxy.$participateInSave(workingCopy.resource, context.reason, token).then(_ => {
                 clearTimeout(_warningTimeout);
                 return undefined;

package/vscode/src/vs/workbench/api/browser/mainThreadOutputService.js

@@ -94,11 +94,11 @@ let MainThreadOutputService = class MainThreadOutputService extends Disposable {
     }
     _showChannelQuietly(channel) {
         const statusProperties = {
-            name: ( localize(2604, "Show Output")),
+            name: ( localize(2599, "Show Output")),
             text: "$(output)",
-            ariaLabel: ( localize(2605, "Show {0} Output Channel", channel.label)),
+            ariaLabel: ( localize(2600, "Show {0} Output Channel", channel.label)),
             command: `workbench.action.output.show.${channel.id}`,
-            tooltip: ( localize(2606, "Show {0} Output Channel", channel.label)),
+            tooltip: ( localize(2601, "Show {0} Output Channel", channel.label)),
             kind: "prominent"
         };
         if (!this._outputStatusItem.value) {

package/vscode/src/vs/workbench/api/browser/mainThreadProgress.js

@@ -38,7 +38,7 @@ let MainThreadProgress = class MainThreadProgress {
                 location: ProgressLocation.Notification,
                 secondaryActions: [toAction({
                     id: extensionId,
-                    label: ( localize(2607, "Manage Extension")),
+                    label: ( localize(2602, "Manage Extension")),
                     run: () => this._commandService.executeCommand("_extensions.manage", extensionId)
                 })]
             };

package/vscode/src/vs/workbench/api/browser/mainThreadSaveParticipant.js

@@ -17,7 +17,7 @@ class ExtHostSaveParticipant {
             return undefined;
         }
         const p = ( new Promise((resolve, reject) => {
-            setTimeout(() => reject(( new Error(( localize(2608, "Aborted onWillSaveTextDocument-event after 1750ms"))))), 1750);
+            setTimeout(() => reject(( new Error(( localize(2603, "Aborted onWillSaveTextDocument-event after 1750ms"))))), 1750);
             this._proxy.$participateInSave(editorModel.resource, context.reason).then(values => {
                 if (!values.every(success => success)) {
                     return Promise.reject(( new Error("listener failed")));

package/vscode/src/vs/workbench/api/browser/mainThreadTask.js

@@ -397,7 +397,7 @@ var TaskDTO;
         }
         command.presentation = TaskPresentationOptionsDTO.to(task.presentationOptions);
         const source = TaskSourceDTO.to(task.source, workspace);
-        const label = ( localize(2609, "{0}: {1}", source.label, task.name));
+        const label = ( localize(2604, "{0}: {1}", source.label, task.name));
         const definition = TaskDefinitionDTO.to(task.definition, executeOnly);
         const id = (CustomExecutionDTO.is(task.execution) && task._id) ? task._id : `${task.source.extensionId}.${definition._key}`;
         const result = ( new ContributedTask(

package/vscode/src/vs/workbench/api/browser/mainThreadTunnelService.js

@@ -116,13 +116,13 @@ let MainThreadTunnelService = class MainThreadTunnelService extends Disposable {
     }
     async elevationPrompt(tunnelOptions, tunnel, source) {
         return this.notificationService.prompt(Severity.Info, ( localize(
-            2610,
+            2605,
             "The extension {0} has forwarded port {1}. You'll need to run as superuser to use port {2} locally.",
             source,
             tunnelOptions.remoteAddress.port,
             tunnelOptions.localAddressPort
         )), [{
-            label: ( localize(2611, "Use Port {0} as Sudo...", tunnel.tunnelRemotePort)),
+            label: ( localize(2606, "Use Port {0} as Sudo...", tunnel.tunnelRemotePort)),
             run: async () => {
                 this.elevateionRetry = true;
                 await this.remoteExplorerService.close({

package/vscode/src/vs/workbench/api/browser/mainThreadUriOpeners.js

@@ -61,7 +61,7 @@ let MainThreadUriOpeners = class MainThreadUriOpeners extends Disposable {
                     }, token);
                 } catch (e) {
                     if (!isCancellationError(e)) {
-                        const openDefaultAction = ( new Action("default", ( localize(2612, "Open using default opener")), undefined, undefined, async () => {
+                        const openDefaultAction = ( new Action("default", ( localize(2607, "Open using default opener")), undefined, undefined, async () => {
                             await this.openerService.open(uri, {
                                 allowTunneling: false,
                                 allowContributedOpeners: defaultExternalUriOpenerId
@@ -70,7 +70,7 @@ let MainThreadUriOpeners = class MainThreadUriOpeners extends Disposable {
                         openDefaultAction.tooltip = ( uri.toString());
                         this.notificationService.notify({
                             severity: Severity.Error,
-                            message: ( localize(2613, "Could not open uri with '{0}': {1}", id, (e.toString()))),
+                            message: ( localize(2608, "Could not open uri with '{0}': {1}", id, (e.toString()))),
                             actions: {
                                 primary: [openDefaultAction]
                             }

package/vscode/src/vs/workbench/api/browser/mainThreadWebviews.js

@@ -118,7 +118,7 @@ let MainThreadWebviews = class MainThreadWebviews extends Disposable {
                 <meta http-equiv="Content-type" content="text/html;charset=UTF-8">
                 <meta http-equiv="Content-Security-Policy" content="default-src 'none';">
             </head>
-            <body>${( localize(2614, "An error occurred while loading view: {0}", escape(viewType)))}</body>
+            <body>${( localize(2609, "An error occurred while loading view: {0}", escape(viewType)))}</body>
         </html>`;
     }
 };

package/vscode/src/vs/workbench/api/browser/mainThreadWorkspace.js

@@ -114,10 +114,10 @@ let MainThreadWorkspace = class MainThreadWorkspace extends Disposable {
         const wantsToDelete = removeCount > 0;
         if (wantsToAdd && !wantsToDelete) {
             if (addCount === 1) {
-                message = ( localize(2615, "Extension '{0}' added 1 folder to the workspace", extensionName));
+                message = ( localize(2610, "Extension '{0}' added 1 folder to the workspace", extensionName));
             } else {
                 message = ( localize(
-                    2616,
+                    2611,
                     "Extension '{0}' added {1} folders to the workspace",
                     extensionName,
                     addCount
@@ -126,10 +126,10 @@ let MainThreadWorkspace = class MainThreadWorkspace extends Disposable {
         }
         else if (wantsToDelete && !wantsToAdd) {
             if (removeCount === 1) {
-                message = ( localize(2617, "Extension '{0}' removed 1 folder from the workspace", extensionName));
+                message = ( localize(2612, "Extension '{0}' removed 1 folder from the workspace", extensionName));
             } else {
                 message = ( localize(
-                    2618,
+                    2613,
                     "Extension '{0}' removed {1} folders from the workspace",
                     extensionName,
                     removeCount
@@ -137,7 +137,7 @@ let MainThreadWorkspace = class MainThreadWorkspace extends Disposable {
             }
         }
         else {
-            message = ( localize(2619, "Extension '{0}' changed folders of the workspace", extensionName));
+            message = ( localize(2614, "Extension '{0}' changed folders of the workspace", extensionName));
         }
         return message;
     }

package/vscode/src/vs/workbench/contrib/customEditor/common/customTextEditorModel.js

@@ -60,7 +60,7 @@ let CustomTextEditorModel = CustomTextEditorModel_1 = class CustomTextEditorMode
         }));
         this._register(extensionService.onWillStop(e => {
             e.veto(true, ( localize(
-                8014,
+                8143,
                 "An extension provided text editor for '{0}' is still open that would close otherwise.",
                 this.name
             )));

package/vscode/src/vs/workbench/contrib/git/common/gitService.d.ts

@@ -27,15 +27,21 @@ export interface GitDiffChange extends GitChange {
     readonly insertions: number;
     readonly deletions: number;
 }
+export interface GitRemote {
+    readonly name: string;
+    readonly fetchUrl?: string;
+    readonly pushUrl?: string;
+    readonly isReadOnly: boolean;
+}
 export interface GitRepositoryState {
     readonly HEAD?: GitBranch;
+    readonly remotes: readonly GitRemote[];
     readonly mergeChanges: readonly GitChange[];
     readonly indexChanges: readonly GitChange[];
     readonly workingTreeChanges: readonly GitChange[];
     readonly untrackedChanges: readonly GitChange[];
 }
 export interface GitBranch extends GitRef {
-    readonly base?: GitBaseRef;
     readonly upstream?: GitUpstreamRef;
     readonly ahead?: number;
     readonly behind?: number;