Rebase against the upstream 08235aa

vscode-upstream-sha1: 08235aa
che-incubator · Jul 25, 2023 · 2d4b064 · 2d4b064
2 parents 4845055 + 08235aa
commit 2d4b064
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/code/.vscode/notebooks/my-endgame.github-issues b/code/.vscode/notebooks/my-endgame.github-issues
@@ -44,11 +44,6 @@
     "language": "github-issues",
     "value": "$REPOS $MILESTONE $MINE is:issue is:closed reason:completed label:feature-request -label:verification-needed -label:on-testplan -label:verified -label:*duplicate"
   },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": ""
-  },
   {
     "kind": 1,
     "language": "markdown",

diff --git a/code/src/vs/editor/common/model/textModelTokens.ts b/code/src/vs/editor/common/model/textModelTokens.ts
@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { assertFn } from 'vs/base/common/assert';
 import { IdleDeadline, runWhenIdle } from 'vs/base/common/async';
 import { BugIndicatingError, onUnexpectedError } from 'vs/base/common/errors';
 import { setTimeout0 } from 'vs/base/common/platform';
@@ -68,7 +69,7 @@ export class TokenizerWithStateStoreAndTextModel<TState extends IState = IState>
 
 			const r = safeTokenize(this._languageIdCodec, languageId, this.tokenizationSupport, text, true, lineToTokenize.startState);
 			builder.add(lineToTokenize.lineNumber, r.tokens);
-			this!.store.setEndState(lineToTokenize.lineNumber, r.endState as TState);
+			this.store.setEndState(lineToTokenize.lineNumber, r.endState as TState);
 		}
 	}
 
@@ -220,9 +221,9 @@ export class TrackingTokenizationStateStore<TState extends IState> {
 		if (!state) {
 			throw new BugIndicatingError('Cannot set null/undefined state');
 		}
-		if (lineNumber > 1 && !this.tokenizationStateStore.getEndState(lineNumber - 1)) {
-			throw new BugIndicatingError('Cannot set state before setting previous state');
-		}
+
+		// Cannot set state before setting previous state
+		assertFn(() => lineNumber === 1 || !!this.tokenizationStateStore.getEndState(lineNumber - 1));
 
 		while (true) {
 			const min = this._invalidEndStatesLineNumbers.min;

diff --git a/code/src/vs/workbench/contrib/chat/common/chatModel.ts b/code/src/vs/workbench/contrib/chat/common/chatModel.ts
@@ -122,7 +122,7 @@ class Response {
 
 			responsePart.resolvedContent?.then((content) => {
 				// Replace the resolving part's content with the resolved response
-				this._responseParts[responsePosition] = { string: new MarkdownString(content) };
+				this._responseParts[responsePosition] = { string: new MarkdownString(content), resolving: true };
 				this._updateRepr(quiet);
 			});
 		}