@codingame/monaco-vscode-api 4.5.2 → 5.0.0

package/vscode/src/vs/workbench/contrib/chat/common/chatModel.js

@@ -4,9 +4,9 @@ import { DeferredPromise } from '../../../../base/common/async.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { isMarkdownString, MarkdownString } from '../../../../base/common/htmlContent.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
-import { ResourceMap } from '../../../../base/common/map.js';
 import { revive } from '../../../../base/common/marshalling.js';
-import { basename } from '../../../../base/common/resources.js';
+import { equals } from '../../../../base/common/objects.js';
+import { isEqual, basename } from '../../../../base/common/resources.js';
 import { URI, isUriComponents } from '../../../../base/common/uri.js';
 import { generateUuid } from '../../../../base/common/uuid.js';
 import { OffsetRange } from '../../../../editor/common/core/offsetRange.js';
@@ -28,16 +28,20 @@ class ChatRequestModel {
     get avatarIconUri() {
         return this.session.requesterAvatarIconUri;
     }
+    get attempt() {
+        return this._attempt;
+    }
     get variableData() {
         return this._variableData;
     }
     set variableData(v) {
         this._variableData = v;
     }
-    constructor(session, message, _variableData) {
+    constructor(session, message, _variableData, _attempt = 0) {
         this.session = session;
         this.message = message;
         this._variableData = _variableData;
+        this._attempt = _attempt;
         this._id = 'request_' + ChatRequestModel.nextId++;
     }
 }
@@ -63,38 +67,43 @@ class Response {
         this._updateRepr(true);
     }
     updateContent(progress, quiet) {
-        if (progress.kind === 'content' || progress.kind === 'markdownContent') {
+        if (progress.kind === 'markdownContent') {
             const responsePartLength = this._responseParts.length - 1;
             const lastResponsePart = this._responseParts[responsePartLength];
-            if (!lastResponsePart || lastResponsePart.kind !== 'markdownContent') {
-                if (progress.kind === 'content') {
-                    this._responseParts.push({ content: ( new MarkdownString(progress.content)), kind: 'markdownContent' });
-                }
-                else {
-                    this._responseParts.push(progress);
-                }
-            }
-            else if (progress.kind === 'markdownContent') {
-                const lastPartEnabledCommands = typeof lastResponsePart.content.isTrusted === 'object' ?
-                    lastResponsePart.content.isTrusted.enabledCommands :
-                    [];
-                const thisPartEnabledCommands = typeof progress.content.isTrusted === 'object' ?
-                    progress.content.isTrusted.enabledCommands :
-                    [];
-                const enabledCommands = [...lastPartEnabledCommands, ...thisPartEnabledCommands];
-                this._responseParts[responsePartLength] = { content: ( new MarkdownString(
-                    lastResponsePart.content.value + progress.content.value,
-                    { isTrusted: { enabledCommands } }
-                )), kind: 'markdownContent' };
+            if (!lastResponsePart || lastResponsePart.kind !== 'markdownContent' || !canMergeMarkdownStrings(lastResponsePart.content, progress.content)) {
+                this._responseParts.push(progress);
             }
             else {
-                this._responseParts[responsePartLength] = { content: ( new MarkdownString(
-                    lastResponsePart.content.value + progress.content,
-                    lastResponsePart.content
-                )), kind: 'markdownContent' };
+                lastResponsePart.content = {
+                    value: lastResponsePart.content.value + progress.content.value,
+                    isTrusted: lastResponsePart.content.isTrusted,
+                    supportThemeIcons: lastResponsePart.content.supportThemeIcons,
+                    supportHtml: lastResponsePart.content.supportHtml,
+                    baseUri: lastResponsePart.content.baseUri
+                };
             }
             this._updateRepr(quiet);
         }
+        else if (progress.kind === 'textEdit') {
+            if (progress.edits.length > 0) {
+                let found = false;
+                for (let i = 0; !found && i < this._responseParts.length; i++) {
+                    const candidate = this._responseParts[i];
+                    if (candidate.kind === 'textEditGroup' && isEqual(candidate.uri, progress.uri)) {
+                        candidate.edits.push(progress.edits);
+                        found = true;
+                    }
+                }
+                if (!found) {
+                    this._responseParts.push({
+                        kind: 'textEditGroup',
+                        uri: progress.uri,
+                        edits: [progress.edits]
+                    });
+                }
+                this._updateRepr(quiet);
+            }
+        }
         else {
             this._responseParts.push(progress);
             this._updateRepr(quiet);
@@ -111,6 +120,9 @@ class Response {
             else if (part.kind === 'command') {
                 return part.command.title;
             }
+            else if (part.kind === 'textEditGroup') {
+                return '';
+            }
             else {
                 return part.content.value;
             }
@@ -140,15 +152,9 @@ class ChatResponseModel extends Disposable {
     get response() {
         return this._response;
     }
-    get edits() {
-        return this._edits;
-    }
     get result() {
         return this._result;
     }
-    get providerId() {
-        return this.session.providerId;
-    }
     get username() {
         return this.session.responderUsername;
     }
@@ -194,23 +200,12 @@ class ChatResponseModel extends Disposable {
         this._isStale = Array.isArray(_response) && (_response.length !== 0 || isMarkdownString(_response) && _response.value.length !== 0);
         this._followups = followups ? [...followups] : undefined;
         this._response = ( new Response(_response));
-        this._edits = ( new ResourceMap());
         this._register(this._response.onDidChangeValue(() => this._onDidChange.fire()));
         this._id = 'response_' + ChatResponseModel.nextId++;
     }
     updateContent(responsePart, quiet) {
         this._response.updateContent(responsePart, quiet);
     }
-    updateTextEdits(uri, edits) {
-        const array = this._edits.get(uri);
-        if (!array) {
-            this._edits.set(uri, edits);
-        }
-        else {
-            array.push(...edits);
-        }
-        this._onDidChange.fire();
-    }
     applyReference(progress) {
         if (progress.kind === 'usedContext') {
             this._usedContext = progress;
@@ -250,11 +245,21 @@ class ChatResponseModel extends Disposable {
         this._vote = vote;
         this._onDidChange.fire();
     }
+    setEditApplied(edit, editCount) {
+        if (!this.response.value.includes(edit)) {
+            return false;
+        }
+        if (!edit.state) {
+            return false;
+        }
+        edit.state.applied = editCount;
+        this._onDidChange.fire();
+        return true;
+    }
 }
 function isExportableSessionData(obj) {
     const data = obj;
     return typeof data === 'object' &&
-        typeof data.providerId === 'string' &&
         typeof data.requesterUsername === 'string';
 }
 function isSerializableSessionData(obj) {
@@ -278,9 +283,6 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
             firstRequestMessage.text;
         return message.split('\n')[0].substring(0, 50);
     }
-    get session() {
-        return this._session;
-    }
     get welcomeMessage() {
         return this._welcomeMessage;
     }
@@ -291,6 +293,9 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
         const lastRequest = this._requests[this._requests.length - 1];
         return !!lastRequest && !!lastRequest.response && !lastRequest.response.isComplete;
     }
+    get hasRequests() {
+        return this._requests.length > 0;
+    }
     get creationDate() {
         return this._creationDate;
     }
@@ -326,10 +331,13 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
     get title() {
         return ChatModel_1.getDefaultTitle(this._requests);
     }
-    constructor(providerId, initialData, logService, chatAgentService, instantiationService) {
+    get initialLocation() {
+        return this._initialLocation;
+    }
+    constructor(initialData, _initialLocation, logService, chatAgentService, instantiationService) {
         super();
-        this.providerId = providerId;
         this.initialData = initialData;
+        this._initialLocation = _initialLocation;
         this.logService = logService;
         this.chatAgentService = chatAgentService;
         this.instantiationService = instantiationService;
@@ -394,6 +402,12 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
                 ...raw,
                 name: raw.id,
             };
+        if (!('extensionPublisherId' in agent)) {
+            agent.extensionPublisherId = agent.extensionPublisher ?? '';
+        }
+        if (!('extensionDisplayName' in agent)) {
+            agent.extensionDisplayName = '';
+        }
         return revive(agent);
     }
     getParsedRequestFromString(message) {
@@ -412,18 +426,16 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
         this._initState = ChatModelInitState.Initializing;
     }
     deinitialize() {
-        this._session = undefined;
         this._initState = ChatModelInitState.Created;
         this._isInitializedDeferred = ( new DeferredPromise());
     }
-    initialize(session, welcomeMessage) {
+    initialize(welcomeMessage) {
         if (this.initState !== ChatModelInitState.Initializing) {
             throw ( new Error(
                 `ChatModel is in the wrong state for initialize: ${ChatModelInitState[this.initState]}`
             ));
         }
         this._initState = ChatModelInitState.Initialized;
-        this._session = session;
         if (!this._welcomeMessage) {
             this._welcomeMessage = welcomeMessage;
         }
@@ -446,30 +458,21 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
     getRequests() {
         return this._requests;
     }
-    addRequest(message, variableData, chatAgent, slashCommand) {
-        if (!this._session) {
-            throw ( new Error('addRequest: No session'));
-        }
-        const request = ( new ChatRequestModel(this, message, variableData));
+    addRequest(message, variableData, attempt, chatAgent, slashCommand) {
+        const request = ( new ChatRequestModel(this, message, variableData, attempt));
         request.response = ( new ChatResponseModel([], this, chatAgent, slashCommand, request.id));
         this._requests.push(request);
         this._onDidChange.fire({ kind: 'addRequest', request });
         return request;
     }
     acceptResponseProgress(request, progress, quiet) {
-        if (!this._session) {
-            throw ( new Error('acceptResponseProgress: No session'));
-        }
         if (!request.response) {
             request.response = ( new ChatResponseModel([], this, undefined, undefined, request.id));
         }
         if (request.response.isComplete) {
             throw ( new Error('acceptResponseProgress: Adding progress to a completed response'));
         }
-        if (progress.kind === 'vulnerability') {
-            request.response.updateContent({ kind: 'markdownVuln', content: { value: progress.content }, vulnerabilities: progress.vulnerabilities }, quiet);
-        }
-        else if (progress.kind === 'content' || progress.kind === 'markdownContent' || progress.kind === 'treeData' || progress.kind === 'inlineReference' || progress.kind === 'markdownVuln' || progress.kind === 'progressMessage' || progress.kind === 'command') {
+        if (progress.kind === 'markdownContent' || progress.kind === 'treeData' || progress.kind === 'inlineReference' || progress.kind === 'markdownVuln' || progress.kind === 'progressMessage' || progress.kind === 'command' || progress.kind === 'textEdit') {
             request.response.updateContent(progress, quiet);
         }
         else if (progress.kind === 'usedContext' || progress.kind === 'reference') {
@@ -481,9 +484,6 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
                 request.response.setAgent(agent, progress.command);
             }
         }
-        else if (progress.kind === 'textEdit') {
-            request.response.updateTextEdits(progress.uri, progress.edits);
-        }
         else {
             this.logService.error(`Couldn't handle progress: ${JSON.stringify(progress)}`);
         }
@@ -503,9 +503,6 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
         }
     }
     setResponse(request, result) {
-        if (!this._session) {
-            throw ( new Error('completeResponse: No session'));
-        }
         if (!request.response) {
             request.response = ( new ChatResponseModel([], this, undefined, undefined, request.id));
         }
@@ -533,6 +530,7 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
             requesterAvatarIconUri: this.requesterAvatarIconUri,
             responderUsername: this.responderUsername,
             responderAvatarIconUri: this.responderAvatarIcon,
+            initialLocation: this.initialLocation,
             welcomeMessage: this._welcomeMessage?.content.map(c => {
                 if (Array.isArray(c)) {
                     return c;
@@ -566,15 +564,12 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
                     followups: r.response?.followups,
                     isCanceled: r.response?.isCanceled,
                     vote: r.response?.vote,
-                    agent: r.response?.agent ?
-                        { id: r.response.agent.id, name: r.response.agent.name, description: r.response.agent.description, extensionId: r.response.agent.extensionId, metadata: r.response.agent.metadata, slashCommands: [], locations: r.response.agent.locations, isDefault: r.response.agent.isDefault }
-                        : undefined,
+                    agent: r.response?.agent ? { ...r.response.agent } : undefined,
                     slashCommand: r.response?.slashCommand,
                     usedContext: r.response?.usedContext,
                     contentReferences: r.response?.contentReferences
                 };
             })),
-            providerId: this.providerId,
         };
     }
     toJSON() {
@@ -586,7 +581,6 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
         };
     }
     dispose() {
-        this._session?.dispose?.();
         this._requests.forEach(r => r.response?.dispose());
         this._onDidDispose.fire();
         super.dispose();
@@ -619,12 +613,15 @@ let ChatWelcomeMessageModel = class ChatWelcomeMessageModel {
 ChatWelcomeMessageModel = ChatWelcomeMessageModel_1 = ( __decorate([
     ( __param(2, IChatAgentService))
 ], ChatWelcomeMessageModel));
-function getHistoryEntriesFromModel(model) {
+function getHistoryEntriesFromModel(model, forAgentId) {
     const history = [];
     for (const request of model.getRequests()) {
         if (!request.response) {
             continue;
         }
+        if (forAgentId && forAgentId !== request.response.agent?.id) {
+            continue;
+        }
         const promptTextResult = getPromptText(request.message);
         const historyRequest = {
             sessionId: model.sessionId,
@@ -650,4 +647,22 @@ function updateRanges(variableData, diff) {
         })))
     };
 }
-export { ChatModel, ChatModelInitState, ChatRequestModel, ChatResponseModel, ChatWelcomeMessageModel, Response, getHistoryEntriesFromModel, isExportableSessionData, isSerializableSessionData, updateRanges };
+function canMergeMarkdownStrings(md1, md2) {
+    if (md1.baseUri && md2.baseUri) {
+        const baseUriEquals = md1.baseUri.scheme === md2.baseUri.scheme
+            && md1.baseUri.authority === md2.baseUri.authority
+            && md1.baseUri.path === md2.baseUri.path
+            && md1.baseUri.query === md2.baseUri.query
+            && md1.baseUri.fragment === md2.baseUri.fragment;
+        if (!baseUriEquals) {
+            return false;
+        }
+    }
+    else if (md1.baseUri || md2.baseUri) {
+        return false;
+    }
+    return equals(md1.isTrusted, md2.isTrusted) &&
+        md1.supportHtml === md2.supportHtml &&
+        md1.supportThemeIcons === md2.supportThemeIcons;
+}
+export { ChatModel, ChatModelInitState, ChatRequestModel, ChatResponseModel, ChatWelcomeMessageModel, Response, canMergeMarkdownStrings, getHistoryEntriesFromModel, isExportableSessionData, isSerializableSessionData, updateRanges };

package/vscode/src/vs/workbench/contrib/chat/common/chatParserTypes.js

@@ -51,19 +51,6 @@ class ChatRequestAgentPart {
     get promptText() {
         return '';
     }
-    toJSON() {
-        return {
-            kind: this.kind,
-            range: this.range,
-            editorRange: this.editorRange,
-            agent: {
-                id: this.agent.id,
-                name: this.agent.name,
-                description: this.agent.description,
-                metadata: this.agent.metadata
-            }
-        };
-    }
 }
 class ChatRequestAgentSubcommandPart {
     static { this.Kind = 'subcommand'; }

package/vscode/src/vs/workbench/contrib/chat/common/chatParticipantContribTypes.js

@@ -0,0 +1,2 @@
+const CHAT_PROVIDER_ID = 'copilot';
+export { CHAT_PROVIDER_ID };

package/vscode/src/vs/workbench/contrib/chat/common/chatViewModel.js

@@ -37,9 +37,6 @@ let ChatViewModel = class ChatViewModel extends Disposable {
     get requestInProgress() {
         return this._model.requestInProgress;
     }
-    get providerId() {
-        return this._model.providerId;
-    }
     get initState() {
         return this._model.initState;
     }
@@ -181,6 +178,9 @@ class ChatRequestViewModel {
     get messageText() {
         return this.message.text;
     }
+    get attempt() {
+        return this._model.attempt;
+    }
     constructor(_model) {
         this._model = _model;
     }
@@ -192,9 +192,6 @@ let ChatResponseViewModel = class ChatResponseViewModel extends Disposable {
     get dataId() {
         return this._model.id + `_${this._modelChangeCount}` + `_${ChatModelInitState[this._model.session.initState]}`;
     }
-    get providerId() {
-        return this._model.providerId;
-    }
     get sessionId() {
         return this._model.session.sessionId;
     }
@@ -225,9 +222,6 @@ let ChatResponseViewModel = class ChatResponseViewModel extends Disposable {
     get progressMessages() {
         return this._model.progressMessages;
     }
-    get edits() {
-        return this._model.edits;
-    }
     get isComplete() {
         return this._model.isComplete;
     }
@@ -316,6 +310,10 @@ let ChatResponseViewModel = class ChatResponseViewModel extends Disposable {
         this._modelChangeCount++;
         this._model.setVote(vote);
     }
+    setEditApplied(edit, editCount) {
+        this._modelChangeCount++;
+        this._model.setEditApplied(edit, editCount);
+    }
 };
 ChatResponseViewModel = ( __decorate([
     ( __param(1, ILogService))

package/vscode/src/vs/workbench/contrib/chat/common/languageModelStats.service.js

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

package/vscode/src/vs/workbench/contrib/codeEditor/browser/dictation/editorDictation.js

@@ -8,7 +8,7 @@ import { IContextKeyService } from '../../../../../platform/contextkey/common/co
 import { SpeechToTextStatus, HasSpeechProvider } from '../../../speech/common/speechService.js';
 import { ISpeechService } from '../../../speech/common/speechService.service.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
-import { EditorAction2, registerEditorContribution } from '../../../../../editor/browser/editorExtensions.js';
+import { registerEditorContribution, EditorAction2 } from '../../../../../editor/browser/editorExtensions.js';
 import { EditorContextKeys } from '../../../../../editor/common/editorContextKeys.js';
 import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.service.js';
 import { EditOperation } from '../../../../../editor/common/core/editOperation.js';

package/vscode/src/vs/workbench/contrib/codeEditor/browser/diffEditorHelper.js

@@ -1,5 +1,6 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
+import '../../../../base/common/arrays.js';
 import '../../../../base/common/observableInternal/derived.js';
 import { autorunWithStore } from '../../../../base/common/observableInternal/autorun.js';
 import { observableFromEvent } from '../../../../base/common/observableInternal/utils.js';

package/vscode/src/vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget.js

@@ -33,7 +33,7 @@ const NLS_CLOSE_BTN_LABEL = ( localizeWithPath(_moduleId, 4, "Close"));
 const SIMPLE_FIND_WIDGET_INITIAL_WIDTH = 310;
 const MATCHES_COUNT_WIDTH = 73;
 class SimpleFindWidget extends Widget {
-    constructor(options, contextViewService, contextKeyService, _keybindingService) {
+    constructor(options, contextViewService, contextKeyService, hoverService, _keybindingService) {
         super();
         this._keybindingService = _keybindingService;
         this._isVisible = false;
@@ -99,21 +99,21 @@ class SimpleFindWidget extends Widget {
             onTrigger: () => {
                 this.find(true);
             }
-        }))));
+        }, hoverService))));
         this.nextBtn = this._register(( (new SimpleButton({
             label: NLS_NEXT_MATCH_BTN_LABEL + (options.nextMatchActionId ? this._getKeybinding(options.nextMatchActionId) : ''),
             icon: findNextMatchIcon,
             onTrigger: () => {
                 this.find(false);
             }
-        }))));
+        }, hoverService))));
         const closeBtn = this._register(( (new SimpleButton({
             label: NLS_CLOSE_BTN_LABEL + (options.closeWidgetActionId ? this._getKeybinding(options.closeWidgetActionId) : ''),
             icon: widgetClose,
             onTrigger: () => {
                 this.hide();
             }
-        }))));
+        }, hoverService))));
         this._innerDomNode = document.createElement('div');
         this._innerDomNode.classList.add('simple-find-part');
         this._innerDomNode.appendChild(this._findInput.domNode);

package/vscode/src/vs/workbench/contrib/comments/browser/commentNode.js

@@ -6,8 +6,6 @@ import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
 import { Separator, ActionRunner, Action } from '../../../../base/common/actions.js';
 import { Disposable, dispose } from '../../../../base/common/lifecycle.js';
 import { URI } from '../../../../base/common/uri.js';
-import { IModelService } from '../../../../editor/common/services/model.js';
-import { ILanguageService } from '../../../../editor/common/languages/language.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { ICommentService } from './commentService.service.js';
 import { MIN_EDITOR_HEIGHT, SimpleCommentEditor, calculateEditorHeight } from './simpleCommentEditor.js';
@@ -32,11 +30,13 @@ import { Scrollable } from '../../../../base/common/scrollable.js';
 import { SmoothScrollableElement } from '../../../../base/browser/ui/scrollbar/scrollableElement.js';
 import { DomEmitter } from '../../../../base/browser/event.js';
 import { CommentContextKeys } from '../common/commentContextKeys.js';
-import { FileAccess } from '../../../../base/common/network.js';
+import { FileAccess, Schemas } from '../../../../base/common/network.js';
 import { COMMENTS_SECTION } from '../common/commentsConfiguration.js';
 import { StandardMouseEvent } from '../../../../base/browser/mouseEvent.js';
 import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.service.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.service.js';
+import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
 const _moduleId = "vs/workbench/contrib/comments/browser/commentNode";
 class CommentsActionRunner extends ActionRunner {
     async runAction(action, context) {
@@ -47,7 +47,7 @@ let CommentNode = class CommentNode extends Disposable {
     get domNode() {
         return this._domNode;
     }
-    constructor(parentEditor, commentThread, comment, pendingEdit, owner, resource, parentThread, markdownRenderer, instantiationService, commentService, modelService, languageService, notificationService, contextMenuService, contextKeyService, configurationService, accessibilityService, keybindingService) {
+    constructor(parentEditor, commentThread, comment, pendingEdit, owner, resource, parentThread, markdownRenderer, instantiationService, commentService, notificationService, contextMenuService, contextKeyService, configurationService, hoverService, accessibilityService, keybindingService, textModelService) {
         super();
         this.parentEditor = parentEditor;
         this.commentThread = commentThread;
@@ -59,13 +59,13 @@ let CommentNode = class CommentNode extends Disposable {
         this.markdownRenderer = markdownRenderer;
         this.instantiationService = instantiationService;
         this.commentService = commentService;
-        this.modelService = modelService;
-        this.languageService = languageService;
         this.notificationService = notificationService;
         this.contextMenuService = contextMenuService;
         this.configurationService = configurationService;
+        this.hoverService = hoverService;
         this.accessibilityService = accessibilityService;
         this.keybindingService = keybindingService;
+        this.textModelService = textModelService;
         this._editAction = null;
         this._commentEditContainer = null;
         this._commentEditor = null;
@@ -185,7 +185,7 @@ let CommentNode = class CommentNode extends Disposable {
         }
         else {
             if (!this._timestampWidget) {
-                this._timestampWidget = ( (new TimestampWidget(this.configurationService, this._timestamp, timestamp)));
+                this._timestampWidget = ( (new TimestampWidget(this.configurationService, this.hoverService, this._timestamp, timestamp)));
                 this._register(this._timestampWidget);
             }
             else {
@@ -386,12 +386,16 @@ let CommentNode = class CommentNode extends Disposable {
     get commentBodyValue() {
         return (typeof this.comment.body === 'string') ? this.comment.body : this.comment.body.value;
     }
-    createCommentEditor(editContainer) {
+    async createCommentEditor(editContainer) {
         const container = append(editContainer, $('.edit-textarea'));
         this._commentEditor = this.instantiationService.createInstance(SimpleCommentEditor, container, SimpleCommentEditor.getEditorOptions(this.configurationService), this._contextKeyService, this.parentThread);
-        const resource = ( (URI.parse(`comment:commentinput-${this.comment.uniqueIdInThread}-${Date.now()}.md`)));
-        this._commentEditorModel = this.modelService.createModel('', this.languageService.createByFilepathOrFirstLine(resource), resource, false);
-        this._commentEditor.setModel(this._commentEditorModel);
+        const resource = ( (URI.from({
+            scheme: Schemas.commentsInput,
+            path: `/commentinput-${this.comment.uniqueIdInThread}-${Date.now()}.md`
+        })));
+        const modelRef = await this.textModelService.createModelReference(resource);
+        this._commentEditorModel = modelRef;
+        this._commentEditor.setModel(this._commentEditorModel.object.textEditorModel);
         this._commentEditor.setValue(this.pendingEdit ?? this.commentBodyValue);
         this.pendingEdit = undefined;
         this._commentEditor.layout({ width: container.clientWidth - 14, height: this._editorHeight });
@@ -400,8 +404,8 @@ let CommentNode = class CommentNode extends Disposable {
             this._commentEditor.layout({ width: container.clientWidth - 14, height: this._editorHeight });
             this._commentEditor.focus();
         });
-        const lastLine = this._commentEditorModel.getLineCount();
-        const lastColumn = this._commentEditorModel.getLineLength(lastLine) + 1;
+        const lastLine = this._commentEditorModel.object.textEditorModel.getLineCount();
+        const lastColumn = this._commentEditorModel.object.textEditorModel.getLineLength(lastLine) + 1;
         this._commentEditor.setSelection(( (new Selection(lastLine, lastColumn, lastLine, lastColumn))));
         const commentThread = this.commentThread;
         commentThread.input = {
@@ -431,7 +435,7 @@ let CommentNode = class CommentNode extends Disposable {
             }
         }));
         this.calculateEditorHeight();
-        this._register((this._commentEditorModel.onDidChangeContent(() => {
+        this._register((this._commentEditorModel.object.textEditorModel.onDidChangeContent(() => {
             if (this._commentEditor && this.calculateEditorHeight()) {
                 this._commentEditor.layout({ height: this._editorHeight, width: this._commentEditor.getLayoutInfo().width });
                 this._commentEditor.render(true);
@@ -479,14 +483,14 @@ let CommentNode = class CommentNode extends Disposable {
         const height = getContentHeight(this._body) + 4;
         this._scrollableElement.setScrollDimensions({ width, scrollWidth, height, scrollHeight });
     }
-    switchToEditMode() {
+    async switchToEditMode() {
         if (this.isEditing) {
             return;
         }
         this.isEditing = true;
         this._body.classList.add('hidden');
         this._commentEditContainer = append(this._commentDetailsContainer, $('.edit-container'));
-        this.createCommentEditor(this._commentEditContainer);
+        await this.createCommentEditor(this._commentEditContainer);
         const formActions = append(this._commentEditContainer, $('.form-actions'));
         const otherActions = append(formActions, $('.other-actions'));
         this.createCommentWidgetFormActions(otherActions);
@@ -563,7 +567,7 @@ let CommentNode = class CommentNode extends Disposable {
             actionsContainer.classList.remove('mouseover');
         }));
     }
-    update(newComment) {
+    async update(newComment) {
         if (newComment.body !== this.comment.body) {
             this.updateCommentBody(newComment.body);
         }
@@ -574,7 +578,7 @@ let CommentNode = class CommentNode extends Disposable {
         this.comment = newComment;
         if (isChangingMode) {
             if (newComment.mode === CommentMode.Editing) {
-                this.switchToEditMode();
+                await this.switchToEditMode();
             }
             else {
                 this.removeCommentEditor();
@@ -631,14 +635,14 @@ let CommentNode = class CommentNode extends Disposable {
 CommentNode = ( (__decorate([
     ( (__param(8, IInstantiationService))),
     ( (__param(9, ICommentService))),
-    ( (__param(10, IModelService))),
-    ( (__param(11, ILanguageService))),
-    ( (__param(12, INotificationService))),
-    ( (__param(13, IContextMenuService))),
-    ( (__param(14, IContextKeyService))),
-    ( (__param(15, IConfigurationService))),
-    ( (__param(16, IAccessibilityService))),
-    ( (__param(17, IKeybindingService)))
+    ( (__param(10, INotificationService))),
+    ( (__param(11, IContextMenuService))),
+    ( (__param(12, IContextKeyService))),
+    ( (__param(13, IConfigurationService))),
+    ( (__param(14, IHoverService))),
+    ( (__param(15, IAccessibilityService))),
+    ( (__param(16, IKeybindingService))),
+    ( (__param(17, ITextModelService)))
 ], CommentNode)));
 function fillInActions(groups, target, useAlternativeActions, isPrimaryGroup = group => group === 'navigation') {
     for (const tuple of groups) {