@codingame/monaco-vscode-extensions-service-override
Advanced tools
Comparing version 10.1.4 to 11.0.0
@@ -232,3 +232,3 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js'; | ||
registerAssets({ | ||
'vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.esm.html': () => changeUrlDomain(new URL('./assets/webWorkerExtensionHostIframe.esm.html', import.meta.url).href, iframeAlternateDomains) | ||
'vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html': () => changeUrlDomain(new URL('./assets/webWorkerExtensionHostIframe.html', import.meta.url).href, iframeAlternateDomains) | ||
}); | ||
@@ -247,3 +247,3 @@ function getServiceOverride(workerConfig, _iframeAlternateDomains) { | ||
registerAssets({ | ||
'vs/workbench/api/worker/extensionHostWorker.esm.js': () => workerConfig.url | ||
'vs/workbench/api/worker/extensionHostWorkerMain.js': () => workerConfig.url | ||
}); | ||
@@ -250,0 +250,0 @@ } |
{ | ||
"name": "@codingame/monaco-vscode-extensions-service-override", | ||
"version": "10.1.4", | ||
"version": "11.0.0", | ||
"keywords": [], | ||
@@ -29,5 +29,9 @@ "author": { | ||
"dependencies": { | ||
"vscode": "npm:@codingame/monaco-vscode-api@10.1.4", | ||
"@codingame/monaco-vscode-files-service-override": "10.1.4" | ||
"vscode": "npm:@codingame/monaco-vscode-api@11.0.0", | ||
"@codingame/monaco-vscode-files-service-override": "11.0.0", | ||
"@codingame/monaco-vscode-chat-extensions-notebook-common": "11.0.0", | ||
"@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common": "11.0.0", | ||
"@codingame/monaco-vscode-chat-extensions-notebook-terminal-common": "11.0.0", | ||
"@codingame/monaco-vscode-comments-extensions-common": "11.0.0" | ||
} | ||
} |
@@ -14,5 +14,5 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js'; | ||
const notFound = (id) => ( localize(9912, "Extension '{0}' not found.", id)); | ||
const notFound = (id) => ( localize(10002, "Extension '{0}' not found.", id)); | ||
const useId = ( localize( | ||
9913, | ||
10003, | ||
"Make sure you use the full extension ID, including the publisher, e.g.: {0}", | ||
@@ -54,3 +54,3 @@ 'ms-dotnettools.csharp' | ||
if (this.location) { | ||
this.logger.info(( localize(9914, "Extensions installed on {0}:", this.location))); | ||
this.logger.info(( localize(10004, "Extensions installed on {0}:", this.location))); | ||
} | ||
@@ -70,3 +70,3 @@ extensions = extensions.sort((e1, e2) => e1.identifier.id.localeCompare(e2.identifier.id)); | ||
if (extensions.length) { | ||
this.logger.info(this.location ? ( localize(9915, "Installing extensions on {0}...", this.location)) : ( localize(9916, "Installing extensions..."))); | ||
this.logger.info(this.location ? ( localize(10005, "Installing extensions on {0}...", this.location)) : ( localize(10006, "Installing extensions..."))); | ||
} | ||
@@ -114,7 +114,7 @@ const installVSIXInfos = []; | ||
catch (error) { | ||
this.logger.error(( localize(9917, "Error while installing extensions: {0}", getErrorMessage(error)))); | ||
this.logger.error(( localize(10007, "Error while installing extensions: {0}", getErrorMessage(error)))); | ||
throw error; | ||
} | ||
if (failed.length) { | ||
throw ( (new Error(localize(9918, "Failed Installing Extensions: {0}", failed.join(', '))))); | ||
throw ( (new Error(localize(10008, "Failed Installing Extensions: {0}", failed.join(', '))))); | ||
} | ||
@@ -131,3 +131,3 @@ } | ||
this.logger.trace(( localize( | ||
9919, | ||
10009, | ||
"Fetching latest versions for {0} extensions", | ||
@@ -149,7 +149,7 @@ installedExtensionsQuery.length | ||
if (!extensionsToUpdate.length) { | ||
this.logger.info(( localize(9920, "No extension to update"))); | ||
this.logger.info(( localize(10010, "No extension to update"))); | ||
return; | ||
} | ||
this.logger.info(( localize( | ||
9921, | ||
10011, | ||
"Updating extensions: {0}", | ||
@@ -162,3 +162,3 @@ ( (extensionsToUpdate.map(ext => ext.extension.identifier.id))).join(', ') | ||
this.logger.error(( localize( | ||
9922, | ||
10012, | ||
"Error while updating extension {0}: {1}", | ||
@@ -171,3 +171,3 @@ extensionResult.identifier.id, | ||
this.logger.info(( localize( | ||
9923, | ||
10013, | ||
"Extension '{0}' v{1} was successfully updated.", | ||
@@ -186,3 +186,3 @@ extensionResult.identifier.id, | ||
this.logger.info(( localize( | ||
9924, | ||
10014, | ||
"Extension '{0}' v{1} is already installed. Use '--force' option to update to latest version or provide '@<version>' to install a specific version, for example: '{2}@1.2.3'.", | ||
@@ -196,3 +196,3 @@ id, | ||
if (version && installedExtension.manifest.version === version) { | ||
this.logger.info(( localize(9925, "Extension '{0}' is already installed.", `${id}@${version}`))); | ||
this.logger.info(( localize(10015, "Extension '{0}' is already installed.", `${id}@${version}`))); | ||
return false; | ||
@@ -231,3 +231,3 @@ } | ||
this.logger.info(( localize( | ||
9925, | ||
10015, | ||
"Extension '{0}' is already installed.", | ||
@@ -239,3 +239,3 @@ version ? `${id}@${version}` : id | ||
this.logger.info(( localize( | ||
9926, | ||
10016, | ||
"Updating the extension '{0}' to the version {1}", | ||
@@ -247,6 +247,6 @@ id, | ||
if (installOptions.isBuiltin) { | ||
this.logger.info(version ? ( localize(9927, "Installing builtin extension '{0}' v{1}...", id, version)) : ( localize(9928, "Installing builtin extension '{0}'...", id))); | ||
this.logger.info(version ? ( localize(10017, "Installing builtin extension '{0}' v{1}...", id, version)) : ( localize(10018, "Installing builtin extension '{0}'...", id))); | ||
} | ||
else { | ||
this.logger.info(version ? ( localize(9929, "Installing extension '{0}' v{1}...", id, version)) : ( localize(9930, "Installing extension '{0}'...", id))); | ||
this.logger.info(version ? ( localize(10019, "Installing extension '{0}' v{1}...", id, version)) : ( localize(10020, "Installing extension '{0}'...", id))); | ||
} | ||
@@ -263,3 +263,3 @@ extensionsToInstall.push({ | ||
this.logger.error(( localize( | ||
9931, | ||
10021, | ||
"Error while installing extension {0}: {1}", | ||
@@ -273,3 +273,3 @@ extensionResult.identifier.id, | ||
this.logger.info(( localize( | ||
9932, | ||
10022, | ||
"Extension '{0}' v{1} was successfully installed.", | ||
@@ -293,7 +293,7 @@ extensionResult.identifier.id, | ||
await this.extensionManagementService.install(vsix, { ...installOptions, installGivenVersion: true }); | ||
this.logger.info(( localize(9933, "Extension '{0}' was successfully installed.", basename(vsix)))); | ||
this.logger.info(( localize(10023, "Extension '{0}' was successfully installed.", basename(vsix)))); | ||
} | ||
catch (error) { | ||
if (isCancellationError(error)) { | ||
this.logger.info(( localize(9934, "Cancelled installing extension '{0}'.", basename(vsix)))); | ||
this.logger.info(( localize(10024, "Cancelled installing extension '{0}'.", basename(vsix)))); | ||
} | ||
@@ -333,3 +333,3 @@ else { | ||
this.logger.info(( localize( | ||
9935, | ||
10025, | ||
"A newer version of extension '{0}' v{1} is already installed. Use '--force' option to downgrade to older version.", | ||
@@ -362,3 +362,3 @@ newer.identifier.id, | ||
this.logger.info(( localize( | ||
9936, | ||
10026, | ||
"Extension '{0}' is a Built-in extension and cannot be uninstalled", | ||
@@ -371,3 +371,3 @@ id | ||
this.logger.info(( localize( | ||
9937, | ||
10027, | ||
"Extension '{0}' is marked as a Built-in extension by user. Please use '--force' option to uninstall it.", | ||
@@ -378,3 +378,3 @@ id | ||
} | ||
this.logger.info(( localize(9938, "Uninstalling {0}...", id))); | ||
this.logger.info(( localize(10028, "Uninstalling {0}...", id))); | ||
for (const extensionToUninstall of extensionsToUninstall) { | ||
@@ -385,3 +385,3 @@ await this.extensionManagementService.uninstall(extensionToUninstall, { profileLocation }); | ||
this.logger.info(( localize( | ||
9939, | ||
10029, | ||
"Extension '{0}' was successfully uninstalled from {1}!", | ||
@@ -393,3 +393,3 @@ id, | ||
else { | ||
this.logger.info(( localize(9940, "Extension '{0}' was successfully uninstalled!", id))); | ||
this.logger.info(( localize(10030, "Extension '{0}' was successfully uninstalled!", id))); | ||
} | ||
@@ -412,3 +412,3 @@ } | ||
notInstalled(id) { | ||
return this.location ? ( localize(9941, "Extension '{0}' is not installed on {1}.", id, this.location)) : ( localize(9942, "Extension '{0}' is not installed.", id)); | ||
return this.location ? ( localize(10031, "Extension '{0}' is not installed on {1}.", id, this.location)) : ( localize(10032, "Extension '{0}' is not installed.", id)); | ||
} | ||
@@ -415,0 +415,0 @@ }; |
@@ -39,3 +39,3 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js'; | ||
await this._proxy.$removeSession(this.id, sessionId); | ||
this.notificationService.info(( localize(4859, "Successfully signed out."))); | ||
this.notificationService.info(( localize(4984, "Successfully signed out."))); | ||
} | ||
@@ -100,3 +100,3 @@ } | ||
message = ( localize( | ||
4860, | ||
4985, | ||
"The extension '{0}' wants to access the language models provided by {1}.", | ||
@@ -110,3 +110,3 @@ extensionName, | ||
? ( localize( | ||
4861, | ||
4986, | ||
"The extension '{0}' wants you to sign in again using {1}.", | ||
@@ -117,3 +117,3 @@ extensionName, | ||
: ( localize( | ||
4862, | ||
4987, | ||
"The extension '{0}' wants to sign in using {1}.", | ||
@@ -126,3 +126,3 @@ extensionName, | ||
{ | ||
label: ( localize(4863, "&&Allow")), | ||
label: ( localize(4988, "&&Allow")), | ||
run() { | ||
@@ -135,3 +135,3 @@ return true; | ||
buttons.push({ | ||
label: ( localize(4864, "Learn more")), | ||
label: ( localize(4989, "Learn more")), | ||
run: async () => { | ||
@@ -155,5 +155,5 @@ const result = this.loginPrompt(provider, extensionName, recreatingSession, options); | ||
const result = await this.dialogService.prompt({ | ||
message: ( localize(4865, "Incorrect account detected")), | ||
message: ( localize(4990, "Incorrect account detected")), | ||
detail: ( localize( | ||
4866, | ||
4991, | ||
"The chosen account, {0}, does not match the requested account, {1}.", | ||
@@ -167,7 +167,7 @@ chosenAccountLabel, | ||
{ | ||
label: ( localize(4867, 'Keep {0}', chosenAccountLabel)), | ||
label: ( localize(4992, 'Keep {0}', chosenAccountLabel)), | ||
run: () => chosenAccountLabel | ||
}, | ||
{ | ||
label: ( localize(4868, 'Login with {0}', requestedAccountLabel)), | ||
label: ( localize(4993, 'Login with {0}', requestedAccountLabel)), | ||
run: () => requestedAccountLabel | ||
@@ -260,3 +260,3 @@ } | ||
this.sendProviderUsageTelemetry(extensionId, providerId); | ||
this.authenticationUsageService.addAccountUsage(providerId, session.account.label, extensionId, extensionName); | ||
this.authenticationUsageService.addAccountUsage(providerId, session.account.label, scopes, extensionId, extensionName); | ||
} | ||
@@ -263,0 +263,0 @@ return session; |
@@ -15,13 +15,13 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js'; | ||
import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service'; | ||
import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol'; | ||
import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service'; | ||
import { ChatInputPart } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chatInputPart'; | ||
import { ChatInputPart } from '@codingame/monaco-vscode-chat-extensions-notebook-common/vscode/vs/workbench/contrib/chat/browser/chatInputPart'; | ||
import { AddDynamicVariableAction } from '@codingame/monaco-vscode-chat-extensions-notebook-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables'; | ||
import { ChatAgentLocation } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents'; | ||
import { IChatAgentService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents.service'; | ||
import { ChatRequestAgentPart } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatParserTypes'; | ||
import { ChatRequestParser } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatRequestParser'; | ||
import { ChatRequestAgentPart } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes'; | ||
import { ChatRequestParser } from '@codingame/monaco-vscode-chat-extensions-notebook-common/vscode/vs/workbench/contrib/chat/common/chatRequestParser'; | ||
import { IChatService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatService.service'; | ||
import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js'; | ||
import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service'; | ||
import { addDynamicVariableActionId } from 'vscode/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariablesConstant'; | ||
import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol'; | ||
@@ -68,2 +68,3 @@ class MainThreadChatTask { | ||
this._activeTasks = ( new Map()); | ||
this._unresolvedAnchors = ( new Map()); | ||
this._proxy = ( extHostContext.getProxy(ExtHostContext.ExtHostChatAgents2)); | ||
@@ -103,3 +104,3 @@ this._register(this._chatService.onDidDisposeSession(e => { | ||
$registerAgent(handle, extension, id, metadata, dynamicProps) { | ||
const staticAgentRegistration = this._chatAgentService.getAgent(id); | ||
const staticAgentRegistration = this._chatAgentService.getAgent(id, true); | ||
if (!staticAgentRegistration && !dynamicProps) { | ||
@@ -154,3 +155,3 @@ if (this._chatAgentService.getAgentsByName(id).length) { | ||
disambiguation: [], | ||
locations: [ChatAgentLocation.Panel] | ||
locations: [ChatAgentLocation.Panel], | ||
}, impl); | ||
@@ -206,4 +207,21 @@ } | ||
} | ||
if (revivedProgress.kind === 'inlineReference' && revivedProgress.resolveId) { | ||
if (!( this._unresolvedAnchors.has(requestId))) { | ||
this._unresolvedAnchors.set(requestId, ( new Map())); | ||
} | ||
this._unresolvedAnchors.get(requestId)?.set(revivedProgress.resolveId, revivedProgress); | ||
} | ||
this._pendingProgress.get(requestId)?.(revivedProgress); | ||
} | ||
$handleAnchorResolve(requestId, handle, resolveAnchor) { | ||
const anchor = this._unresolvedAnchors.get(requestId)?.get(handle); | ||
if (!anchor) { | ||
return; | ||
} | ||
this._unresolvedAnchors.get(requestId)?.delete(handle); | ||
if (resolveAnchor) { | ||
const revivedAnchor = revive(resolveAnchor); | ||
anchor.inlineReference = revivedAnchor.inlineReference; | ||
} | ||
} | ||
$registerAgentCompletionsProvider(handle, id, triggerCharacters) { | ||
@@ -255,3 +273,3 @@ const provide = async (query, token) => { | ||
documentation: v.documentation, | ||
command: { id: addDynamicVariableActionId, title: '', arguments: [{ id: v.id, widget, range: rangeAfterInsert, variableData: revive(v.value), command: v.command }] } | ||
command: { id: AddDynamicVariableAction.ID, title: '', arguments: [{ id: v.id, widget, range: rangeAfterInsert, variableData: revive(v.value), command: v.command }] } | ||
}; | ||
@@ -258,0 +276,0 @@ })); |
@@ -49,26 +49,32 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js'; | ||
})(); | ||
const cliService = instantiationService.createChild(( (new ServiceCollection([IExtensionManagementService, remoteExtensionManagementService])))).createInstance(RemoteExtensionManagementCLI, logger); | ||
if (args.list) { | ||
await cliService.listExtensions(!!args.list.showVersions, args.list.category, undefined); | ||
} | ||
else { | ||
const revive = (inputs) => ( (inputs.map(input => isString(input) ? input : URI.revive(input)))); | ||
if (Array.isArray(args.install) && args.install.length) { | ||
try { | ||
await cliService.installExtensions(revive(args.install), [], { isMachineScoped: true }, !!args.force); | ||
} | ||
catch (e) { | ||
lines.push(e.message); | ||
} | ||
const childInstantiationService = instantiationService.createChild(( (new ServiceCollection([IExtensionManagementService, remoteExtensionManagementService])))); | ||
try { | ||
const cliService = childInstantiationService.createInstance(RemoteExtensionManagementCLI, logger); | ||
if (args.list) { | ||
await cliService.listExtensions(!!args.list.showVersions, args.list.category, undefined); | ||
} | ||
if (Array.isArray(args.uninstall) && args.uninstall.length) { | ||
try { | ||
await cliService.uninstallExtensions(revive(args.uninstall), !!args.force, undefined); | ||
else { | ||
const revive = (inputs) => ( (inputs.map(input => isString(input) ? input : URI.revive(input)))); | ||
if (Array.isArray(args.install) && args.install.length) { | ||
try { | ||
await cliService.installExtensions(revive(args.install), [], { isMachineScoped: true }, !!args.force); | ||
} | ||
catch (e) { | ||
lines.push(e.message); | ||
} | ||
} | ||
catch (e) { | ||
lines.push(e.message); | ||
if (Array.isArray(args.uninstall) && args.uninstall.length) { | ||
try { | ||
await cliService.uninstallExtensions(revive(args.uninstall), !!args.force, undefined); | ||
} | ||
catch (e) { | ||
lines.push(e.message); | ||
} | ||
} | ||
} | ||
return lines.join('\n'); | ||
} | ||
return lines.join('\n'); | ||
finally { | ||
childInstantiationService.dispose(); | ||
} | ||
}); | ||
@@ -89,3 +95,3 @@ let RemoteExtensionManagementCLI = class RemoteExtensionManagementCLI extends ExtensionManagementCLI { | ||
this.logger.info(( localize( | ||
4810, | ||
4935, | ||
"Cannot install the '{0}' extension because it is declared to not run in this setup.", | ||
@@ -92,0 +98,0 @@ getExtensionId(manifest.publisher, manifest.name) |
import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js'; | ||
import { Emitter } from 'vscode/vscode/vs/base/common/event'; | ||
import { Disposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle'; | ||
import { DisposableStore, DisposableMap, Disposable } from 'vscode/vscode/vs/base/common/lifecycle'; | ||
import { URI } from 'vscode/vscode/vs/base/common/uri'; | ||
@@ -10,5 +10,5 @@ import { Range } from 'vscode/vscode/vs/editor/common/core/range'; | ||
import { ICommentService } from 'vscode/vscode/vs/workbench/contrib/comments/browser/commentService.service'; | ||
import { CommentsPanel } from 'vscode/vscode/vs/workbench/contrib/comments/browser/commentsView'; | ||
import { CommentsPanel } from '@codingame/monaco-vscode-comments-extensions-common/vscode/vs/workbench/contrib/comments/browser/commentsView'; | ||
import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol'; | ||
import { COMMENTS_VIEW_ID, COMMENTS_VIEW_TITLE, COMMENTS_VIEW_STORAGE_ID } from 'vscode/vscode/vs/workbench/contrib/comments/browser/commentsTreeViewer'; | ||
import { COMMENTS_VIEW_ID, COMMENTS_VIEW_TITLE, COMMENTS_VIEW_STORAGE_ID } from '@codingame/monaco-vscode-comments-extensions-common/vscode/vs/workbench/contrib/comments/browser/commentsTreeViewer'; | ||
import { Extensions } from 'vscode/vscode/vs/workbench/common/views'; | ||
@@ -23,3 +23,3 @@ import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service'; | ||
import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service'; | ||
import { revealCommentThread } from 'vscode/vscode/vs/workbench/contrib/comments/browser/commentsController'; | ||
import { revealCommentThread } from '@codingame/monaco-vscode-comments-extensions-common/vscode/vs/workbench/contrib/comments/browser/commentsController'; | ||
import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service'; | ||
@@ -76,2 +76,5 @@ import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service'; | ||
set collapsibleState(newState) { | ||
if (this.initialCollapsibleState === undefined) { | ||
this.initialCollapsibleState = newState; | ||
} | ||
if (newState !== this._collapsibleState) { | ||
@@ -87,5 +90,2 @@ this._collapsibleState = newState; | ||
this._initialCollapsibleState = initialCollapsibleState; | ||
if (this.collapsibleState === undefined) { | ||
this.collapsibleState = this.initialCollapsibleState; | ||
} | ||
this._onDidChangeInitialCollapsibleState.fire(initialCollapsibleState); | ||
@@ -162,3 +162,3 @@ } | ||
if (modified('collapseState')) { | ||
this.initialCollapsibleState = changes.collapseState; | ||
this.collapsibleState = changes.collapseState; | ||
} | ||
@@ -197,2 +197,11 @@ if (modified('canReply')) { | ||
} | ||
class CommentThreadWithDisposable { | ||
constructor(thread) { | ||
this.thread = thread; | ||
this.disposableStore = ( (new DisposableStore())); | ||
} | ||
dispose() { | ||
this.disposableStore.dispose(); | ||
} | ||
} | ||
class MainThreadCommentController { | ||
@@ -237,3 +246,3 @@ get handle() { | ||
this._features = _features; | ||
this._threads = ( (new Map())); | ||
this._threads = ( (new DisposableMap())); | ||
} | ||
@@ -263,3 +272,7 @@ get activeComment() { | ||
))); | ||
this._threads.set(commentThreadHandle, thread); | ||
const threadWithDisposable = ( (new CommentThreadWithDisposable(thread))); | ||
this._threads.set(commentThreadHandle, threadWithDisposable); | ||
threadWithDisposable.disposableStore.add(thread.onDidChangeCollapsibleState(() => { | ||
this.proxy.$updateCommentThread(this.handle, thread.commentThreadHandle, { collapseState: thread.collapsibleState }); | ||
})); | ||
if (thread.isDocumentCommentThread()) { | ||
@@ -305,3 +318,3 @@ this._commentService.updateComments(this._uniqueId, { | ||
const thread = this.getKnownThread(commentThreadHandle); | ||
this._threads.delete(commentThreadHandle); | ||
this._threads.deleteAndDispose(commentThreadHandle); | ||
thread.dispose(); | ||
@@ -326,7 +339,7 @@ if (thread.isDocumentCommentThread()) { | ||
deleteCommentThreadMain(commentThreadId) { | ||
this._threads.forEach(thread => { | ||
for (const { thread } of ( (this._threads.values()))) { | ||
if (thread.threadId === commentThreadId) { | ||
this._proxy.$deleteCommentThread(this._handle, thread.commentThreadHandle); | ||
} | ||
}); | ||
} | ||
} | ||
@@ -349,3 +362,3 @@ updateInput(input) { | ||
} | ||
return thread; | ||
return thread.thread; | ||
} | ||
@@ -368,5 +381,5 @@ async getDocumentComments(resource, token) { | ||
const commentThread = this._threads.get(thread); | ||
if (commentThread.resource === ( (resource.toString()))) { | ||
if (commentThread.isDocumentCommentThread()) { | ||
ret.push(commentThread); | ||
if (commentThread.thread.resource === ( (resource.toString()))) { | ||
if (commentThread.thread.isDocumentCommentThread()) { | ||
ret.push(commentThread.thread); | ||
} | ||
@@ -398,5 +411,5 @@ } | ||
const commentThread = this._threads.get(thread); | ||
if (commentThread.resource === ( (resource.toString()))) { | ||
if (!commentThread.isDocumentCommentThread()) { | ||
ret.push(commentThread); | ||
if (commentThread.thread.resource === ( (resource.toString()))) { | ||
if (!commentThread.thread.isDocumentCommentThread()) { | ||
ret.push(commentThread.thread); | ||
} | ||
@@ -417,3 +430,3 @@ } | ||
for (const thread of [...( (this._threads.keys()))]) { | ||
ret.push(this._threads.get(thread)); | ||
ret.push(this._threads.get(thread).thread); | ||
} | ||
@@ -435,3 +448,3 @@ return ret; | ||
} | ||
const commentsViewIcon = registerIcon('comments-view-icon', Codicon.commentDiscussion, ( localize(4854, 'View icon of the comments view.'))); | ||
const commentsViewIcon = registerIcon('comments-view-icon', Codicon.commentDiscussion, ( localize(4979, 'View icon of the comments view.'))); | ||
let MainThreadComments = class MainThreadComments extends Disposable { | ||
@@ -438,0 +451,0 @@ constructor(extHostContext, _commentService, _viewsService, _viewDescriptorService, _uriIdentityService, _editorService) { |
@@ -291,3 +291,3 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js'; | ||
this._register(extensionService.onWillStop(e => { | ||
e.veto(true, ( localize(9956, "A custom editor for '{0}' is open.", this.name))); | ||
e.veto(true, ( localize(10047, "A custom editor for '{0}' is open.", this.name))); | ||
})); | ||
@@ -359,3 +359,3 @@ } | ||
resource: this._editorResource, | ||
label: label ?? ( localize(9957, "Edit")), | ||
label: label ?? ( localize(10048, "Edit")), | ||
code: 'undoredo.customEditorEdit', | ||
@@ -362,0 +362,0 @@ undo: () => this.undo(), |
@@ -45,3 +45,3 @@ import { Emitter } from 'vscode/vscode/vs/base/common/event'; | ||
const options = codeEditor.getOptions(); | ||
const lineNumbersOpts = options.get(70 ); | ||
const lineNumbersOpts = options.get(69 ); | ||
cursorStyle = options.get(28 ); | ||
@@ -48,0 +48,0 @@ lineNumbers = lineNumbersOpts.renderType; |
@@ -14,3 +14,3 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js'; | ||
import { AbstractTextResourceEditorInput } from 'vscode/vscode/vs/workbench/common/editor/textResourceEditorInput'; | ||
import { ChatEditorInput } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chatEditorInput'; | ||
import { ChatEditorInput } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput'; | ||
import { CustomEditorInput } from 'vscode/vscode/vs/workbench/contrib/customEditor/browser/customEditorInput'; | ||
@@ -21,3 +21,3 @@ import { InteractiveEditorInput } from 'vscode/vscode/vs/workbench/contrib/interactive/browser/interactiveEditorInput'; | ||
import { NotebookEditorInput } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput'; | ||
import { TerminalEditorInput } from 'vscode/vscode/vs/workbench/contrib/terminal/browser/terminalEditorInput'; | ||
import { TerminalEditorInput } from '@codingame/monaco-vscode-chat-extensions-notebook-terminal-common/vscode/vs/workbench/contrib/terminal/browser/terminalEditorInput'; | ||
import { WebviewInput } from 'vscode/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput'; | ||
@@ -24,0 +24,0 @@ import { editorGroupToColumn, columnToEditorGroup } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupColumn'; |
@@ -16,3 +16,3 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js'; | ||
const p = ( (new Promise((resolve, reject) => { | ||
setTimeout(() => reject(( (new Error(( localize(4846, "Aborted onWillCreateEditSessionIdentity-event after 10000ms")))))), this.timeout); | ||
setTimeout(() => reject(( (new Error(( localize(4971, "Aborted onWillCreateEditSessionIdentity-event after 10000ms")))))), this.timeout); | ||
this._proxy.$onWillCreateEditSessionIdentity(workspaceFolder.uri, token, this.timeout).then(resolve, reject); | ||
@@ -19,0 +19,0 @@ }))); |
@@ -91,3 +91,3 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js'; | ||
message: ( localize( | ||
4811, | ||
4936, | ||
"Cannot activate the '{0}' extension because it depends on the '{1}' extension, which is not loaded. Would you like to reload the window to load the extension?", | ||
@@ -98,3 +98,3 @@ extName, | ||
actions: { | ||
primary: [( (new Action('reload', ( localize(4812, "Reload Window")), '', true, () => this._hostService.reload())))] | ||
primary: [( (new Action('reload', ( localize(4937, "Reload Window")), '', true, () => this._hostService.reload())))] | ||
} | ||
@@ -109,3 +109,3 @@ }); | ||
message: ( localize( | ||
4813, | ||
4938, | ||
"Cannot activate the '{0}' extension because it depends on the '{1}' extension which is not supported in the current workspace", | ||
@@ -121,3 +121,3 @@ extName, | ||
message: ( localize( | ||
4814, | ||
4939, | ||
"Cannot activate the '{0}' extension because it depends on the '{1}' extension which is not supported in Restricted Mode", | ||
@@ -128,3 +128,3 @@ extName, | ||
actions: { | ||
primary: [( (new Action('manageWorkspaceTrust', ( localize(4815, "Manage Workspace Trust")), '', true, () => this._commandService.executeCommand('workbench.trust.manage'))))] | ||
primary: [( (new Action('manageWorkspaceTrust', ( localize(4940, "Manage Workspace Trust")), '', true, () => this._commandService.executeCommand('workbench.trust.manage'))))] | ||
} | ||
@@ -137,3 +137,3 @@ }); | ||
message: ( localize( | ||
4816, | ||
4941, | ||
"Cannot activate the '{0}' extension because it depends on the '{1}' extension which is disabled. Would you like to enable the extension and reload the window?", | ||
@@ -144,3 +144,3 @@ extName, | ||
actions: { | ||
primary: [( (new Action('enable', ( localize(4817, "Enable and Reload")), '', true, () => this._extensionEnablementService.setEnablement([missingInstalledDependency], enablementState === 7 ? 9 : 10 ) | ||
primary: [( (new Action('enable', ( localize(4942, "Enable and Reload")), '', true, () => this._extensionEnablementService.setEnablement([missingInstalledDependency], enablementState === 7 ? 9 : 10 ) | ||
.then(() => this._hostService.reload(), e => this._notificationService.error(e)))))] | ||
@@ -154,3 +154,3 @@ } | ||
message: ( localize( | ||
4818, | ||
4943, | ||
"Cannot activate the '{0}' extension because it depends on the '{1}' extension which is disabled.", | ||
@@ -176,3 +176,3 @@ extName, | ||
message: ( localize( | ||
4819, | ||
4944, | ||
"Cannot activate the '{0}' extension because it depends on the '{1}' extension from '{2}', which is not installed. Would you like to install the extension and reload the window?", | ||
@@ -184,3 +184,3 @@ extName, | ||
actions: { | ||
primary: [( (new Action('install', ( localize(4820, "Install and Reload")), '', true, () => this._extensionsWorkbenchService.install(dependencyExtension) | ||
primary: [( (new Action('install', ( localize(4945, "Install and Reload")), '', true, () => this._extensionsWorkbenchService.install(dependencyExtension) | ||
.then(() => this._hostService.reload(), e => this._notificationService.error(e)))))] | ||
@@ -192,3 +192,3 @@ } | ||
this._notificationService.error(( localize( | ||
4821, | ||
4946, | ||
"Cannot activate the '{0}' extension because it depends on an unknown '{1}' extension.", | ||
@@ -195,0 +195,0 @@ extName, |
@@ -74,3 +74,3 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js'; | ||
message = ( localize( | ||
4822, | ||
4947, | ||
"Extension '{0}' wants to make refactoring changes with this file creation", | ||
@@ -82,3 +82,3 @@ data.extensionNames[0] | ||
message = ( localize( | ||
4823, | ||
4948, | ||
"Extension '{0}' wants to make refactoring changes with this file copy", | ||
@@ -90,3 +90,3 @@ data.extensionNames[0] | ||
message = ( localize( | ||
4824, | ||
4949, | ||
"Extension '{0}' wants to make refactoring changes with this file move", | ||
@@ -98,3 +98,3 @@ data.extensionNames[0] | ||
message = ( localize( | ||
4825, | ||
4950, | ||
"Extension '{0}' wants to make refactoring changes with this file deletion", | ||
@@ -108,3 +108,3 @@ data.extensionNames[0] | ||
message = ( localize( | ||
4826, | ||
4951, | ||
"{0} extensions want to make refactoring changes with this file creation", | ||
@@ -116,3 +116,3 @@ data.extensionNames.length | ||
message = ( localize( | ||
4827, | ||
4952, | ||
"{0} extensions want to make refactoring changes with this file copy", | ||
@@ -124,3 +124,3 @@ data.extensionNames.length | ||
message = ( localize( | ||
4828, | ||
4953, | ||
"{0} extensions want to make refactoring changes with this file move", | ||
@@ -132,3 +132,3 @@ data.extensionNames.length | ||
message = ( localize( | ||
4829, | ||
4954, | ||
"{0} extensions want to make refactoring changes with this file deletion", | ||
@@ -143,4 +143,4 @@ data.extensionNames.length | ||
message, | ||
primaryButton: ( localize(4830, "Show &&Preview")), | ||
cancelButton: ( localize(4831, "Skip Changes")) | ||
primaryButton: ( localize(4955, "Show &&Preview")), | ||
cancelButton: ( localize(4956, "Skip Changes")) | ||
}); | ||
@@ -164,7 +164,7 @@ showPreview = true; | ||
{ | ||
label: ( localize(4832, "&&OK")), | ||
label: ( localize(4957, "&&OK")), | ||
run: () => Choice.OK | ||
}, | ||
{ | ||
label: ( localize(4830, "Show &&Preview")), | ||
label: ( localize(4955, "Show &&Preview")), | ||
run: () => Choice.Preview | ||
@@ -174,6 +174,6 @@ } | ||
cancelButton: { | ||
label: ( localize(4831, "Skip Changes")), | ||
label: ( localize(4956, "Skip Changes")), | ||
run: () => Choice.Cancel | ||
}, | ||
checkbox: { label: ( localize(4833, "Do not ask me again")) } | ||
checkbox: { label: ( localize(4958, "Do not ask me again")) } | ||
}); | ||
@@ -195,11 +195,11 @@ if (result === Choice.Cancel) { | ||
case 0 : | ||
return ( localize(4834, "Running 'File Create' participants...")); | ||
return ( localize(4959, "Running 'File Create' participants...")); | ||
case 2 : | ||
return ( localize(4835, "Running 'File Rename' participants...")); | ||
return ( localize(4960, "Running 'File Rename' participants...")); | ||
case 3 : | ||
return ( localize(4836, "Running 'File Copy' participants...")); | ||
return ( localize(4961, "Running 'File Copy' participants...")); | ||
case 1 : | ||
return ( localize(4837, "Running 'File Delete' participants...")); | ||
return ( localize(4962, "Running 'File Delete' participants...")); | ||
case 4 : | ||
return ( localize(4838, "Running 'File Write' participants...")); | ||
return ( localize(4963, "Running 'File Write' participants...")); | ||
} | ||
@@ -275,3 +275,3 @@ } | ||
title: { | ||
value: ( localize(4839, "Reset choice for 'File operation needs preview'")), | ||
value: ( localize(4964, "Reset choice for 'File operation needs preview'")), | ||
original: `Reset choice for 'File operation needs preview'` | ||
@@ -278,0 +278,0 @@ }, |
@@ -433,2 +433,11 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js'; | ||
const commitChars = data["k" ]; | ||
let command; | ||
if (commandId) { | ||
command = { | ||
$ident: commandIdent, | ||
id: commandId, | ||
title: '', | ||
arguments: commandIdent ? [commandIdent] : data["p" ], | ||
}; | ||
} | ||
return { | ||
@@ -449,8 +458,3 @@ label, | ||
additionalTextEdits: data["l" ], | ||
command: commandId ? { | ||
$ident: commandIdent, | ||
id: commandId, | ||
title: '', | ||
arguments: commandIdent ? [commandIdent] : data["p" ], | ||
} : undefined, | ||
command, | ||
_id: data.x, | ||
@@ -457,0 +461,0 @@ }; |
@@ -6,5 +6,6 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js'; | ||
import { DisposableStore, DisposableMap, Disposable, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle'; | ||
import { URI } from 'vscode/vscode/vs/base/common/uri'; | ||
import { localize } from 'vscode/vscode/vs/nls'; | ||
import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service'; | ||
import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol'; | ||
import { ILanguageModelIgnoredFilesService } from 'vscode/vscode/vs/workbench/contrib/chat/common/ignoredFiles.service'; | ||
import { ILanguageModelStatsService } from 'vscode/vscode/vs/workbench/contrib/chat/common/languageModelStats.service'; | ||
@@ -17,5 +18,6 @@ import { ILanguageModelsService } from 'vscode/vscode/vs/workbench/contrib/chat/common/languageModels.service'; | ||
import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service'; | ||
import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol'; | ||
let MainThreadLanguageModels = class MainThreadLanguageModels { | ||
constructor(extHostContext, _chatProviderService, _languageModelStatsService, _logService, _authenticationService, _authenticationAccessService, _extensionService) { | ||
constructor(extHostContext, _chatProviderService, _languageModelStatsService, _logService, _authenticationService, _authenticationAccessService, _extensionService, _ignoredFilesService) { | ||
this._chatProviderService = _chatProviderService; | ||
@@ -27,5 +29,7 @@ this._languageModelStatsService = _languageModelStatsService; | ||
this._extensionService = _extensionService; | ||
this._ignoredFilesService = _ignoredFilesService; | ||
this._store = ( (new DisposableStore())); | ||
this._providerRegistrations = ( (new DisposableMap())); | ||
this._pendingProgress = ( (new Map())); | ||
this._ignoredFileProviderRegistrations = ( (new DisposableMap())); | ||
this._proxy = ( (extHostContext.getProxy(ExtHostContext.ExtHostChatProvider))); | ||
@@ -39,2 +43,3 @@ this._proxy.$acceptChatModelMetadata({ added: ( (_chatProviderService.getLanguageModelIds().map( | ||
this._providerRegistrations.dispose(); | ||
this._ignoredFileProviderRegistrations.dispose(); | ||
this._store.dispose(); | ||
@@ -136,3 +141,3 @@ } | ||
} | ||
const accountLabel = auth.accountLabel ?? ( localize(4809, 'Language Models')); | ||
const accountLabel = auth.accountLabel ?? ( localize(4934, 'Language Models')); | ||
const disposables = ( (new DisposableStore())); | ||
@@ -160,2 +165,13 @@ this._authenticationService.registerAuthenticationProvider(authProviderId, ( (new LanguageModelAccessAuthProvider(authProviderId, auth.providerLabel, accountLabel)))); | ||
} | ||
$fileIsIgnored(uri, token) { | ||
return this._ignoredFilesService.fileIsIgnored(URI.revive(uri), token); | ||
} | ||
$registerFileIgnoreProvider(handle) { | ||
this._ignoredFileProviderRegistrations.set(handle, this._ignoredFilesService.registerIgnoredFileProvider({ | ||
isFileIgnored: async (uri, token) => this._proxy.$isFileIgnored(handle, uri, token) | ||
})); | ||
} | ||
$unregisterFileIgnoreProvider(handle) { | ||
this._ignoredFileProviderRegistrations.deleteAndDispose(handle); | ||
} | ||
}; | ||
@@ -169,3 +185,4 @@ MainThreadLanguageModels = __decorate([ | ||
( (__param(5, IAuthenticationAccessService))), | ||
( (__param(6, IExtensionService))) | ||
( (__param(6, IExtensionService))), | ||
( (__param(7, ILanguageModelIgnoredFilesService))) | ||
], MainThreadLanguageModels); | ||
@@ -172,0 +189,0 @@ class LanguageModelAccessAuthProvider { |
import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js'; | ||
import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation'; | ||
import { Disposable, DisposableMap } from 'vscode/vscode/vs/base/common/lifecycle'; | ||
@@ -20,3 +21,3 @@ import { ILanguageModelToolsService } from 'vscode/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service'; | ||
async $invokeTool(dto, token) { | ||
return await this._languageModelToolsService.invokeTool(dto, (input, token) => this._proxy.$countTokensForInvocation(dto.callId, input, token), token); | ||
return await this._languageModelToolsService.invokeTool(dto, (input, token) => this._proxy.$countTokensForInvocation(dto.callId, input, token), token ?? CancellationToken.None); | ||
} | ||
@@ -41,4 +42,3 @@ $countTokensForInvocation(callId, input, token) { | ||
}, | ||
provideToolConfirmationMessages: (participantName, parameters, token) => this._proxy.$provideToolConfirmationMessages(id, participantName, parameters, token), | ||
provideToolInvocationMessage: (parameters, token) => this._proxy.$provideToolInvocationMessage(id, parameters, token), | ||
prepareToolInvocation: (parameters, token) => this._proxy.$prepareToolInvocation(id, parameters, token), | ||
}); | ||
@@ -45,0 +45,0 @@ this._tools.set(id, disposable); |
@@ -54,3 +54,3 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js'; | ||
if (!source) { | ||
source = ( localize(4840, "Extension")); | ||
source = ( localize(4965, "Extension")); | ||
} | ||
@@ -61,3 +61,3 @@ const secondaryActions = []; | ||
id: options.source.identifier.value, | ||
label: ( localize(4841, "Manage Extension")), | ||
label: ( localize(4966, "Manage Extension")), | ||
run: () => { | ||
@@ -98,3 +98,3 @@ return this._commandService.executeCommand('_extensions.manage', options.source.identifier.value); | ||
cancelButton = { | ||
label: ( localize(4842, "Cancel")), | ||
label: ( localize(4967, "Cancel")), | ||
run: () => undefined | ||
@@ -105,3 +105,3 @@ }; | ||
cancelButton = { | ||
label: ( localize(4843, "&&OK")), | ||
label: ( localize(4968, "&&OK")), | ||
run: () => undefined | ||
@@ -108,0 +108,0 @@ }; |
@@ -20,3 +20,3 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js'; | ||
const p = ( (new Promise((resolve, reject) => { | ||
_warningTimeout = setTimeout(() => reject(( (new Error(( localize(4855, "Aborted onWillSaveNotebookDocument-event after 1750ms")))))), 1750); | ||
_warningTimeout = setTimeout(() => reject(( (new Error(( localize(4980, "Aborted onWillSaveNotebookDocument-event after 1750ms")))))), 1750); | ||
this._proxy.$participateInSave(workingCopy.resource, context.reason, token).then(_ => { | ||
@@ -23,0 +23,0 @@ clearTimeout(_warningTimeout); |
@@ -33,3 +33,3 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js'; | ||
location: 15 , | ||
secondaryActions: [( (new ManageExtensionAction(extensionId, ( localize(4844, "Manage Extension")), this._commandService)))] | ||
secondaryActions: [( (new ManageExtensionAction(extensionId, ( localize(4969, "Manage Extension")), this._commandService)))] | ||
}; | ||
@@ -36,0 +36,0 @@ options = notificationOptions; |
@@ -19,3 +19,3 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js'; | ||
const p = ( (new Promise((resolve, reject) => { | ||
setTimeout(() => reject(( (new Error(( localize(4845, "Aborted onWillSaveTextDocument-event after 1750ms")))))), 1750); | ||
setTimeout(() => reject(( (new Error(( localize(4970, "Aborted onWillSaveTextDocument-event after 1750ms")))))), 1750); | ||
this._proxy.$participateInSave(editorModel.resource, context.reason).then(values => { | ||
@@ -22,0 +22,0 @@ if (!values.every(success => success)) { |
@@ -209,3 +209,2 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js'; | ||
get acceptInputCommand() { return this.features.acceptInputCommand; } | ||
get actionButton() { return this.features.actionButton ?? undefined; } | ||
get count() { return this._count; } | ||
@@ -215,2 +214,3 @@ get statusBarCommands() { return this._statusBarCommands; } | ||
get commitTemplate() { return this._commitTemplate; } | ||
get actionButton() { return this._actionButton; } | ||
get historyProvider() { return this._historyProvider; } | ||
@@ -238,4 +238,3 @@ constructor(proxy, _handle, _providerId, _label, _rootUri, _inputBoxTextModel, _quickDiffService, _uriIdentService, _workspaceContextService) { | ||
this._commitTemplate = observableValue(this, ''); | ||
this._onDidChange = ( new Emitter()); | ||
this.onDidChange = this._onDidChange.event; | ||
this._actionButton = observableValue(this, undefined); | ||
this.isSCM = true; | ||
@@ -255,6 +254,8 @@ this._historyProvider = observableValue(this, undefined); | ||
this.features = { ...this.features, ...features }; | ||
this._onDidChange.fire(); | ||
if (typeof features.commitTemplate !== 'undefined') { | ||
this._commitTemplate.set(features.commitTemplate, undefined); | ||
} | ||
if (typeof features.actionButton !== 'undefined') { | ||
this._actionButton.set(features.actionButton, undefined); | ||
} | ||
if (typeof features.count !== 'undefined') { | ||
@@ -261,0 +262,0 @@ this._count.set(features.count, undefined); |
@@ -380,3 +380,3 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js'; | ||
const source = TaskSourceDTO.to(task.source, workspace); | ||
const label = ( localize(4856, '{0}: {1}', source.label, task.name)); | ||
const label = ( localize(4981, '{0}: {1}', source.label, task.name)); | ||
const definition = TaskDefinitionDTO.to(task.definition, executeOnly); | ||
@@ -503,5 +503,9 @@ const id = (CustomExecutionDTO.is(task.execution) && task._id) ? task._id : `${task.source.extensionId}.${definition._key}`; | ||
} | ||
const processedExtension = { | ||
...value.extension, | ||
extensionLocation: URI.revive(value.extension.extensionLocation) | ||
}; | ||
return { | ||
tasks, | ||
extension: value.extension | ||
extension: processedExtension | ||
}; | ||
@@ -508,0 +512,0 @@ }); |
@@ -77,3 +77,3 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js'; | ||
const itemsToRefresh = dataProvider.dataProvider.getItemsToRefresh(itemsToRefreshByHandle); | ||
return viewer.refresh(itemsToRefresh.length ? itemsToRefresh : undefined); | ||
return viewer.refresh(itemsToRefresh.items.length ? itemsToRefresh.items : undefined, itemsToRefresh.checkboxes.length ? itemsToRefresh.checkboxes : undefined); | ||
} | ||
@@ -253,15 +253,19 @@ return Promise.resolve(); | ||
const itemsToRefresh = []; | ||
const checkboxesToRefresh = []; | ||
if (itemsToRefreshByHandle) { | ||
for (const treeItemHandle of ( Object.keys(itemsToRefreshByHandle))) { | ||
const currentTreeItem = this.getItem(treeItemHandle); | ||
for (const newTreeItemHandle of ( Object.keys(itemsToRefreshByHandle))) { | ||
const currentTreeItem = this.getItem(newTreeItemHandle); | ||
if (currentTreeItem) { | ||
const treeItem = itemsToRefreshByHandle[treeItemHandle]; | ||
this.updateTreeItem(currentTreeItem, treeItem); | ||
if (treeItemHandle === treeItem.handle) { | ||
const newTreeItem = itemsToRefreshByHandle[newTreeItemHandle]; | ||
if (currentTreeItem.checkbox?.isChecked !== newTreeItem.checkbox?.isChecked) { | ||
checkboxesToRefresh.push(currentTreeItem); | ||
} | ||
this.updateTreeItem(currentTreeItem, newTreeItem); | ||
if (newTreeItemHandle === newTreeItem.handle) { | ||
itemsToRefresh.push(currentTreeItem); | ||
} | ||
else { | ||
this.itemsMap.delete(treeItemHandle); | ||
this.itemsMap.delete(newTreeItemHandle); | ||
this.itemsMap.set(currentTreeItem.handle, currentTreeItem); | ||
const parent = treeItem.parentHandle ? this.itemsMap.get(treeItem.parentHandle) : null; | ||
const parent = newTreeItem.parentHandle ? this.itemsMap.get(newTreeItem.parentHandle) : null; | ||
if (parent) { | ||
@@ -274,3 +278,3 @@ itemsToRefresh.push(parent); | ||
} | ||
return itemsToRefresh; | ||
return { items: itemsToRefresh, checkboxes: checkboxesToRefresh }; | ||
} | ||
@@ -277,0 +281,0 @@ getItem(treeItemHandle) { |
@@ -114,3 +114,3 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js'; | ||
return this.notificationService.prompt(Severity$1.Info, ( localize( | ||
4857, | ||
4982, | ||
"The extension {0} has forwarded port {1}. You'll need to run as superuser to use port {2} locally.", | ||
@@ -121,3 +121,3 @@ source, | ||
)), [{ | ||
label: ( localize(4858, "Use Port {0} as Sudo...", tunnel.tunnelRemotePort)), | ||
label: ( localize(4983, "Use Port {0} as Sudo...", tunnel.tunnelRemotePort)), | ||
run: async () => { | ||
@@ -124,0 +124,0 @@ this.elevateionRetry = true; |
@@ -54,3 +54,3 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js'; | ||
if (!isCancellationError(e)) { | ||
const openDefaultAction = ( (new Action('default', ( localize(4847, "Open using default opener")), undefined, undefined, async () => { | ||
const openDefaultAction = ( (new Action('default', ( localize(4972, "Open using default opener")), undefined, undefined, async () => { | ||
await this.openerService.open(uri, { | ||
@@ -65,3 +65,3 @@ allowTunneling: false, | ||
message: ( localize( | ||
4848, | ||
4973, | ||
'Could not open uri with \'{0}\': {1}', | ||
@@ -68,0 +68,0 @@ id, |
@@ -106,3 +106,3 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js'; | ||
</head> | ||
<body>${( localize(9911, "An error occurred while loading view: {0}", escape(viewType)))}</body> | ||
<body>${( localize(10033, "An error occurred while loading view: {0}", escape(viewType)))}</body> | ||
</html>`; | ||
@@ -109,0 +109,0 @@ } |
@@ -79,7 +79,7 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js'; | ||
if (addCount === 1) { | ||
message = ( localize(4849, "Extension '{0}' added 1 folder to the workspace", extensionName)); | ||
message = ( localize(4974, "Extension '{0}' added 1 folder to the workspace", extensionName)); | ||
} | ||
else { | ||
message = ( localize( | ||
4850, | ||
4975, | ||
"Extension '{0}' added {1} folders to the workspace", | ||
@@ -93,7 +93,7 @@ extensionName, | ||
if (removeCount === 1) { | ||
message = ( localize(4851, "Extension '{0}' removed 1 folder from the workspace", extensionName)); | ||
message = ( localize(4976, "Extension '{0}' removed 1 folder from the workspace", extensionName)); | ||
} | ||
else { | ||
message = ( localize( | ||
4852, | ||
4977, | ||
"Extension '{0}' removed {1} folders from the workspace", | ||
@@ -106,3 +106,3 @@ extensionName, | ||
else { | ||
message = ( localize(4853, "Extension '{0}' changed folders of the workspace", extensionName)); | ||
message = ( localize(4978, "Extension '{0}' changed folders of the workspace", extensionName)); | ||
} | ||
@@ -109,0 +109,0 @@ return message; |
@@ -49,3 +49,3 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js'; | ||
this._register(extensionService.onWillStop(e => { | ||
e.veto(true, ( localize(11400, "A custom text editor for '{0}' is open.", this.resource.path))); | ||
e.veto(true, ( localize(11520, "A custom text editor for '{0}' is open.", this.resource.path))); | ||
})); | ||
@@ -52,0 +52,0 @@ } |
@@ -141,7 +141,7 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js'; | ||
const goodPrompt = { | ||
label: ( localize(1154, "I can't reproduce")), | ||
label: ( localize(1320, "I can't reproduce")), | ||
run: () => this._commandService.executeCommand('extension.bisect.next', false) | ||
}; | ||
const badPrompt = { | ||
label: ( localize(1155, "I can reproduce")), | ||
label: ( localize(1321, "I can reproduce")), | ||
run: () => this._commandService.executeCommand('extension.bisect.next', true) | ||
@@ -155,7 +155,7 @@ }; | ||
? ( localize( | ||
1156, | ||
1322, | ||
"Extension Bisect is active and has disabled 1 extension. Check if you can still reproduce the problem and proceed by selecting from these options." | ||
)) | ||
: ( localize( | ||
1157, | ||
1323, | ||
"Extension Bisect is active and has disabled {0} extensions. Check if you can still reproduce the problem and proceed by selecting from these options.", | ||
@@ -178,3 +178,3 @@ this._extensionBisectService.disabledCount | ||
id: 'extension.bisect.start', | ||
title: ( localize2(1158, 'Start Extension Bisect')), | ||
title: ( localize2(1324, 'Start Extension Bisect')), | ||
category: Categories.Help, | ||
@@ -199,9 +199,9 @@ f1: true, | ||
const res = await dialogService.confirm({ | ||
message: ( localize(1159, "Extension Bisect")), | ||
message: ( localize(1325, "Extension Bisect")), | ||
detail: ( localize( | ||
1160, | ||
1326, | ||
"Extension Bisect will use binary search to find an extension that causes a problem. During the process the window reloads repeatedly (~{0} times). Each time you must confirm if you are still seeing problems.", | ||
2 + Math.log2(extensions.length) | 0 | ||
)), | ||
primaryButton: ( localize(1161, "&&Start Extension Bisect")) | ||
primaryButton: ( localize(1327, "&&Start Extension Bisect")) | ||
}); | ||
@@ -218,3 +218,3 @@ if (res.confirmed) { | ||
id: 'extension.bisect.next', | ||
title: ( localize2(1162, 'Continue Extension Bisect')), | ||
title: ( localize2(1328, 'Continue Extension Bisect')), | ||
category: Categories.Help, | ||
@@ -253,4 +253,4 @@ f1: true, | ||
if (done.bad) { | ||
await dialogService.info(( localize(1163, "Extension Bisect")), ( localize( | ||
1164, | ||
await dialogService.info(( localize(1329, "Extension Bisect")), ( localize( | ||
1330, | ||
"Extension Bisect is done but no extension has been identified. This might be a problem with {0}.", | ||
@@ -263,11 +263,11 @@ productService.nameShort | ||
type: Severity$1.Info, | ||
message: ( localize(1163, "Extension Bisect")), | ||
primaryButton: ( localize(1165, "&&Report Issue & Continue")), | ||
cancelButton: ( localize(1166, "Continue")), | ||
message: ( localize(1329, "Extension Bisect")), | ||
primaryButton: ( localize(1331, "&&Report Issue & Continue")), | ||
cancelButton: ( localize(1332, "Continue")), | ||
detail: ( localize( | ||
1167, | ||
1333, | ||
"Extension Bisect is done and has identified {0} as the extension causing the problem.", | ||
done.id | ||
)), | ||
checkbox: { label: ( localize(1168, "Keep this extension disabled")), checked: true } | ||
checkbox: { label: ( localize(1334, "Keep this extension disabled")), checked: true } | ||
}); | ||
@@ -287,5 +287,5 @@ if (res.checkboxChecked) { | ||
type: Severity$1.Info, | ||
message: ( localize(1169, "Extension Bisect")), | ||
message: ( localize(1335, "Extension Bisect")), | ||
detail: ( localize( | ||
1170, | ||
1336, | ||
"Extension Bisect is active and has disabled {0} extensions. Check if you can still reproduce the problem and proceed by selecting from these options.", | ||
@@ -296,11 +296,11 @@ bisectService.disabledCount | ||
{ | ||
label: ( localize(1171, "I ca&&n't reproduce")), | ||
label: ( localize(1337, "I ca&&n't reproduce")), | ||
run: () => false | ||
}, | ||
{ | ||
label: ( localize(1172, "I can &&reproduce")), | ||
label: ( localize(1338, "I can &&reproduce")), | ||
run: () => true | ||
}, | ||
{ | ||
label: ( localize(1173, "&&Stop Bisect")), | ||
label: ( localize(1339, "&&Stop Bisect")), | ||
run: () => undefined | ||
@@ -310,3 +310,3 @@ } | ||
cancelButton: { | ||
label: ( localize(1174, "&&Cancel Bisect")), | ||
label: ( localize(1340, "&&Cancel Bisect")), | ||
run: () => null | ||
@@ -322,3 +322,3 @@ } | ||
id: 'extension.bisect.stop', | ||
title: ( localize2(1175, 'Stop Extension Bisect')), | ||
title: ( localize2(1341, 'Stop Extension Bisect')), | ||
category: Categories.Help, | ||
@@ -325,0 +325,0 @@ f1: true, |
@@ -62,3 +62,3 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js'; | ||
const suffix = `?${( suffixSearchParams.toString())}`; | ||
const iframeModulePath = `vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.${'esm.' }html`; | ||
const iframeModulePath = `vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html`; | ||
if (isWeb) { | ||
@@ -144,8 +144,6 @@ const webEndpointUrlTemplate = this._productService.webEndpointUrlTemplate; | ||
if (event.data.type === 'vscode.bootstrap.nls') { | ||
const baseUrl = undefined ; | ||
iframe.contentWindow.postMessage({ | ||
type: event.data.type, | ||
data: { | ||
baseUrl, | ||
workerUrl: ( ( FileAccess.asBrowserUri('vs/workbench/api/worker/extensionHostWorker.esm.js')).toString(true)) , | ||
workerUrl: ( ( FileAccess.asBrowserUri('vs/workbench/api/worker/extensionHostWorkerMain.js')).toString(true)), | ||
fileRoot: globalThis._VSCODE_FILE_ROOT, | ||
@@ -152,0 +150,0 @@ nls: { |
@@ -168,8 +168,13 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js'; | ||
event.join(async () => { | ||
await this._remoteAgentService.endConnection(); | ||
await this._doStopExtensionHosts(); | ||
this._remoteAgentService.getConnection()?.dispose(); | ||
try { | ||
await this._remoteAgentService.endConnection(); | ||
await this._doStopExtensionHosts(); | ||
this._remoteAgentService.getConnection()?.dispose(); | ||
} | ||
catch { | ||
this._logService.warn('Error while disconnecting remote agent'); | ||
} | ||
}, { | ||
id: 'join.disconnectRemote', | ||
label: ( localize(1141, "Disconnect Remote Agent")), | ||
label: ( localize(1307, "Disconnect Remote Agent")), | ||
order: WillShutdownJoinerOrder.Last | ||
@@ -181,3 +186,3 @@ }); | ||
id: 'join.stopExtensionHosts', | ||
label: ( localize(1142, "Stopping Extension Hosts")), | ||
label: ( localize(1308, "Stopping Extension Hosts")), | ||
}); | ||
@@ -253,3 +258,3 @@ } | ||
message: ( localize( | ||
1143, | ||
1309, | ||
"The following extensions contain dependency loops and have been disabled: {0}", | ||
@@ -408,3 +413,3 @@ ( (result.removedDueToLooping.map(e => `'${e.identifier.value}'`))).join(', ') | ||
message: ( localize( | ||
1143, | ||
1309, | ||
"The following extensions contain dependency loops and have been disabled: {0}", | ||
@@ -424,3 +429,3 @@ ( (result.removedDueToLooping.map(e => `'${e.identifier.value}'`))).join(', ') | ||
const msg = ( localize( | ||
1144, | ||
1310, | ||
"No extension host found that can launch the test runner at {0}.", | ||
@@ -595,3 +600,3 @@ (this._environmentService.extensionTestsLocationURI.toString()) | ||
}).catch(error => { | ||
vetoReasons.add(( localize(1145, "{0} (Error: {1})", reason, toErrorMessage(error)))); | ||
vetoReasons.add(( localize(1311, "{0} (Error: {1})", reason, toErrorMessage(error)))); | ||
}); | ||
@@ -609,6 +614,6 @@ } | ||
this._logService.warn(`Extension host was not stopped because of veto (stop reason: ${reason}, veto reason: ${vetoReasonsArray.join(', ')})`); | ||
await this._dialogService.warn(( localize(1146, "The following operation was blocked: {0}", reason)), vetoReasonsArray.length === 1 ? | ||
( localize(1147, "The reason for blocking the operation: {0}", vetoReasonsArray[0])) : | ||
await this._dialogService.warn(( localize(1312, "The following operation was blocked: {0}", reason)), vetoReasonsArray.length === 1 ? | ||
( localize(1313, "The reason for blocking the operation: {0}", vetoReasonsArray[0])) : | ||
( localize( | ||
1148, | ||
1314, | ||
"The reasons for blocking the operation:\n- {0}", | ||
@@ -711,3 +716,3 @@ vetoReasonsArray.join('\n -') | ||
this._logService.info(`Automatically restarting the remote extension host.`); | ||
this._notificationService.status(( localize(1149, "The remote extension host terminated unexpectedly. Restarting...")), { hideAfter: 5000 }); | ||
this._notificationService.status(( localize(1315, "The remote extension host terminated unexpectedly. Restarting...")), { hideAfter: 5000 }); | ||
this._startExtensionHostsIfNecessary(false, Array.from(( (this._allRequestedActivateEvents.keys())))); | ||
@@ -717,6 +722,6 @@ } | ||
this._notificationService.prompt(Severity$1.Error, ( localize( | ||
1150, | ||
1316, | ||
"Remote Extension host terminated unexpectedly 3 times within the last 5 minutes." | ||
)), [{ | ||
label: ( localize(1151, "Restart Remote Extension Host")), | ||
label: ( localize(1317, "Restart Remote Extension Host")), | ||
run: () => { | ||
@@ -1206,3 +1211,3 @@ this._startExtensionHostsIfNecessary(false, Array.from(( (this._allRequestedActivateEvents.keys())))); | ||
id: 'activationEvents', | ||
label: ( localize(1152, "Activation Events")), | ||
label: ( localize(1318, "Activation Events")), | ||
access: { | ||
@@ -1209,0 +1214,0 @@ canToggle: false |
@@ -484,3 +484,3 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js'; | ||
id: 'editor.action.measureExtHostLatency', | ||
title: ( localize2(4805, "Measure Extension Host Latency")), | ||
title: ( localize2(4930, "Measure Extension Host Latency")), | ||
category: Categories.Developer, | ||
@@ -487,0 +487,0 @@ f1: true |
@@ -110,3 +110,3 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js'; | ||
id: 'enabledApiProposals', | ||
label: ( localize(1153, "API Proposals")), | ||
label: ( localize(1319, "API Proposals")), | ||
access: { | ||
@@ -113,0 +113,0 @@ canToggle: false |
@@ -11,3 +11,3 @@ import { ExtensionIdentifierMap } from 'vscode/vscode/vs/platform/extensions/common/extensions'; | ||
logService.warn(( localize( | ||
4806, | ||
4931, | ||
"Overwriting extension {0} with {1}.", | ||
@@ -32,3 +32,3 @@ extension.extensionLocation.fsPath, | ||
logService.warn(( localize( | ||
4806, | ||
4931, | ||
"Overwriting extension {0} with {1}.", | ||
@@ -50,3 +50,3 @@ extension.extensionLocation.fsPath, | ||
logService.warn(( localize( | ||
4807, | ||
4932, | ||
"Overwriting {0} with Workspace Extension {1}.", | ||
@@ -61,3 +61,3 @@ extension.extensionLocation.fsPath, | ||
logService.info(( localize( | ||
4808, | ||
4933, | ||
"Loading development extension at {0}", | ||
@@ -64,0 +64,0 @@ developedExtension.extensionLocation.fsPath |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
882919
18487
6
+ Added@codingame/monaco-vscode-chat-extensions-notebook-common@11.0.0
+ Added@codingame/monaco-vscode-chat-extensions-notebook-terminal-common@11.0.0
+ Added@codingame/monaco-vscode-comments-extensions-common@11.0.0
+ Added@codingame/monaco-vscode-api@11.0.0(transitive)
+ Added@codingame/monaco-vscode-base-service-override@11.0.0(transitive)
+ Added@codingame/monaco-vscode-chat-comments-extensions-interactive-notebook-search-common@11.0.0(transitive)
+ Added@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common@11.0.0(transitive)
+ Added@codingame/monaco-vscode-chat-extensions-notebook-common@11.0.0(transitive)
+ Added@codingame/monaco-vscode-chat-extensions-notebook-task-terminal-testing-common@11.0.0(transitive)
+ Added@codingame/monaco-vscode-chat-extensions-notebook-terminal-common@11.0.0(transitive)
+ Added@codingame/monaco-vscode-chat-extensions-notebook-terminal-testing-common@11.0.0(transitive)
+ Added@codingame/monaco-vscode-comments-extensions-common@11.0.0(transitive)
+ Added@codingame/monaco-vscode-environment-service-override@11.0.0(transitive)
+ Added@codingame/monaco-vscode-files-service-override@11.0.0(transitive)
+ Added@codingame/monaco-vscode-host-service-override@11.0.0(transitive)
+ Added@codingame/monaco-vscode-layout-service-override@11.0.0(transitive)
+ Added@codingame/monaco-vscode-quickaccess-service-override@11.0.0(transitive)
+ Added@xterm/addon-clipboard@0.2.0-beta.53(transitive)
+ Added@xterm/addon-image@0.9.0-beta.70(transitive)
+ Added@xterm/addon-search@0.16.0-beta.70(transitive)
+ Added@xterm/addon-serialize@0.14.0-beta.70(transitive)
+ Added@xterm/addon-unicode11@0.9.0-beta.70(transitive)
+ Added@xterm/addon-webgl@0.19.0-beta.70(transitive)
+ Added@xterm/xterm@5.6.0-beta.70(transitive)
+ Addedjs-base64@3.7.7(transitive)
+ Addedjschardet@3.1.4(transitive)
- Removed@codingame/monaco-vscode-api@10.1.4(transitive)
- Removed@codingame/monaco-vscode-base-service-override@10.1.4(transitive)
- Removed@codingame/monaco-vscode-environment-service-override@10.1.4(transitive)
- Removed@codingame/monaco-vscode-files-service-override@10.1.4(transitive)
- Removed@codingame/monaco-vscode-host-service-override@10.1.4(transitive)
- Removed@codingame/monaco-vscode-layout-service-override@10.1.4(transitive)
- Removed@codingame/monaco-vscode-quickaccess-service-override@10.1.4(transitive)
- Removedjschardet@3.1.3(transitive)
Updated@codingame/monaco-vscode-files-service-override@11.0.0