From 3f91c9bcd730c75212c76ece0622ff95045dc67b Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Mon, 6 May 2024 13:59:56 -0700 Subject: [PATCH] Pick up latest TS for building VS Code (#210956) * Pick up latest TS for building VS Code * Update * Update yarn lock --- build/yarn.lock | 13 +++++++++++++ package.json | 2 +- src/vs/base/common/observableInternal/autorun.ts | 2 +- src/vs/base/common/observableInternal/derived.ts | 2 +- .../editor/common/services/findSectionHeaders.ts | 2 +- .../test/common/modes/supports/onEnterRules.ts | 6 +++--- .../contrib/notebook/common/notebookCommon.ts | 2 +- .../snippets/test/browser/snippetsService.test.ts | 4 ++-- yarn.lock | 14 +++++++------- 9 files changed, 30 insertions(+), 17 deletions(-) diff --git a/build/yarn.lock b/build/yarn.lock index 03248b45c22..cb4f5cfcae4 100644 --- a/build/yarn.lock +++ b/build/yarn.lock @@ -429,6 +429,11 @@ resolved "https://registry.yarnpkg.com/@types/events/-/events-1.2.0.tgz#81a6731ce4df43619e5c8c945383b3e62a89ea86" integrity sha512-KEIlhXnIutzKwRbQkGWb/I4HFqBuUykAdHgDED6xqwXJfONCjF5VoE0cXEiurh3XauygxzeDzgtXUqvLkxFzzA== +"@types/expect@^1.20.4": + version "1.20.4" + resolved "https://registry.yarnpkg.com/@types/expect/-/expect-1.20.4.tgz#8288e51737bf7e3ab5d7c77bfa695883745264e5" + integrity sha512-Q5Vn3yjTDyCMV50TB6VRIbQNxSE4OmZR86VSbGaNpfUolm0iePBB4KdEEHmxoY5sT2+2DIvXW0rvMDP2nHZ4Mg== + "@types/fancy-log@^1.3.0": version "1.3.0" resolved "https://registry.yarnpkg.com/@types/fancy-log/-/fancy-log-1.3.0.tgz#a61ab476e5e628cd07a846330df53b85e05c8ce0" @@ -659,6 +664,14 @@ dependencies: "@types/node" "*" +"@types/vinyl@*": + version "2.0.12" + resolved "https://registry.yarnpkg.com/@types/vinyl/-/vinyl-2.0.12.tgz#17642ca9a8ae10f3db018e9f885da4188db4c6e6" + integrity sha512-Sr2fYMBUVGYq8kj3UthXFAu5UN6ZW+rYr4NACjZQJvHvj+c8lYv0CahmZ2P/r7iUkN44gGUBwqxZkrKXYPb7cw== + dependencies: + "@types/expect" "^1.20.4" + "@types/node" "*" + "@types/workerpool@^6.4.0": version "6.4.0" resolved "https://registry.yarnpkg.com/@types/workerpool/-/workerpool-6.4.0.tgz#c79292915dd08350d10e78e74687b6f401f270b8" diff --git a/package.json b/package.json index aed4553b6dc..e862cfcb31e 100644 --- a/package.json +++ b/package.json @@ -207,7 +207,7 @@ "ts-loader": "^9.4.2", "ts-node": "^10.9.1", "tsec": "0.2.7", - "typescript": "^5.5.0-dev.20240408", + "typescript": "^5.5.0-dev.20240506", "util": "^0.12.4", "vscode-nls-dev": "^3.3.1", "webpack": "^5.91.0", diff --git a/src/vs/base/common/observableInternal/autorun.ts b/src/vs/base/common/observableInternal/autorun.ts index 6c14cb20c5b..a2f169ee4d6 100644 --- a/src/vs/base/common/observableInternal/autorun.ts +++ b/src/vs/base/common/observableInternal/autorun.ts @@ -253,7 +253,7 @@ export class AutorunObserver implements IObserver, IReader const shouldReact = this._handleChange ? this._handleChange({ changedObservable: observable, change, - didChange: o => o === observable as any, + didChange: (o): this is any => o === observable as any, }, this.changeSummary!) : true; if (shouldReact) { this.state = AutorunState.stale; diff --git a/src/vs/base/common/observableInternal/derived.ts b/src/vs/base/common/observableInternal/derived.ts index 4111141589c..9e95bf9dccc 100644 --- a/src/vs/base/common/observableInternal/derived.ts +++ b/src/vs/base/common/observableInternal/derived.ts @@ -350,7 +350,7 @@ export class Derived extends BaseObservable im const shouldReact = this._handleChange ? this._handleChange({ changedObservable: observable, change, - didChange: o => o === observable as any, + didChange: (o): this is any => o === observable as any, }, this.changeSummary!) : true; const wasUpToDate = this.state === DerivedState.upToDate; if (shouldReact && (this.state === DerivedState.dependenciesMightHaveChanged || wasUpToDate)) { diff --git a/src/vs/editor/common/services/findSectionHeaders.ts b/src/vs/editor/common/services/findSectionHeaders.ts index 08bd3709741..8e03723d0dd 100644 --- a/src/vs/editor/common/services/findSectionHeaders.ts +++ b/src/vs/editor/common/services/findSectionHeaders.ts @@ -36,7 +36,7 @@ export interface SectionHeader { shouldBeInComments: boolean; } -const markRegex = /\bMARK:\s*(.*)$/d; +const markRegex = new RegExp('\\bMARK:\\s*(.*)$', 'd'); const trimDashesRegex = /^-+|-+$/g; /** diff --git a/src/vs/editor/test/common/modes/supports/onEnterRules.ts b/src/vs/editor/test/common/modes/supports/onEnterRules.ts index 94869ad640f..66e683fdcf8 100644 --- a/src/vs/editor/test/common/modes/supports/onEnterRules.ts +++ b/src/vs/editor/test/common/modes/supports/onEnterRules.ts @@ -118,14 +118,14 @@ export const cppOnEnterRules = [ export const htmlOnEnterRules = [ { - beforeText: /<(?!(?:area|base|br|col|embed|hr|img|input|keygen|link|menuitem|meta|param|source|track|wbr))([_:\w][_:\w-.\d]*)(?:(?:[^'"/>]|"[^"]*"|'[^']*')*?(?!\/)>)[^<]*$/i, - afterText: /^<\/([_:\w][_:\w-.\d]*)\s*>/i, + beforeText: /<(?!(?:area|base|br|col|embed|hr|img|input|keygen|link|menuitem|meta|param|source|track|wbr))([_:\w][_:\w\-.\d]*)(?:(?:[^'"/>]|"[^"]*"|'[^']*')*?(?!\/)>)[^<]*$/i, + afterText: /^<\/([_:\w][_:\w\-.\d]*)\s*>/i, action: { indentAction: IndentAction.IndentOutdent } }, { - beforeText: /<(?!(?:area|base|br|col|embed|hr|img|input|keygen|link|menuitem|meta|param|source|track|wbr))([_:\w][_:\w-.\d]*)(?:(?:[^'"/>]|"[^"]*"|'[^']*')*?(?!\/)>)[^<]*$/i, + beforeText: /<(?!(?:area|base|br|col|embed|hr|img|input|keygen|link|menuitem|meta|param|source|track|wbr))([_:\w][_:\w\-.\d]*)(?:(?:[^'"/>]|"[^"]*"|'[^']*')*?(?!\/)>)[^<]*$/i, action: { indentAction: IndentAction.Indent } diff --git a/src/vs/workbench/contrib/notebook/common/notebookCommon.ts b/src/vs/workbench/contrib/notebook/common/notebookCommon.ts index 67315a1f315..c269db86ed4 100644 --- a/src/vs/workbench/contrib/notebook/common/notebookCommon.ts +++ b/src/vs/workbench/contrib/notebook/common/notebookCommon.ts @@ -790,7 +790,7 @@ export interface INotebookEditorModel extends IDisposable { readonly viewType: string; readonly notebook: INotebookTextModel | undefined; readonly hasErrorState: boolean; - isResolved(): this is IResolvedNotebookEditorModel; + isResolved(): boolean; isDirty(): boolean; isModified(): boolean; isReadonly(): boolean | IMarkdownString; diff --git a/src/vs/workbench/contrib/snippets/test/browser/snippetsService.test.ts b/src/vs/workbench/contrib/snippets/test/browser/snippetsService.test.ts index 82693d67bdd..ce61496ec51 100644 --- a/src/vs/workbench/contrib/snippets/test/browser/snippetsService.test.ts +++ b/src/vs/workbench/contrib/snippets/test/browser/snippetsService.test.ts @@ -563,10 +563,10 @@ suite('SnippetsService', function () { assert.strictEqual(completions.items.length, 1); }); - test('issue #61296: VS code freezes when editing CSS file with emoji', async function () { + test('issue #61296: VS code freezes when editing CSS fi`le with emoji', async function () { const languageConfigurationService = disposables.add(new TestLanguageConfigurationService()); disposables.add(languageConfigurationService.register('fooLang', { - wordPattern: /(#?-?\d*\.\d\w*%?)|(::?[\w-]*(?=[^,{;]*[,{]))|(([@#.!])?[\w-?]+%?|[@#!.])/g + wordPattern: /(#?-?\d*\.\d\w*%?)|(::?[\w-]*(?=[^,{;]*[,{]))|(([@#.!])?[\w\-?]+%?|[@#!.])/g })); snippetService = new SimpleSnippetService([new Snippet( diff --git a/yarn.lock b/yarn.lock index d9afb5f8499..eced3b8d5a3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1322,9 +1322,9 @@ "@types/node" "*" "@types/vinyl@*": - version "2.0.4" - resolved "https://registry.yarnpkg.com/@types/vinyl/-/vinyl-2.0.4.tgz#9a7a8071c8d14d3a95d41ebe7135babe4ad5995a" - integrity sha512-2o6a2ixaVI2EbwBPg1QYLGQoHK56p/8X/sGfKbFC8N6sY9lfjsMf/GprtkQkSya0D4uRiutRZ2BWj7k3JvLsAQ== + version "2.0.12" + resolved "https://registry.yarnpkg.com/@types/vinyl/-/vinyl-2.0.12.tgz#17642ca9a8ae10f3db018e9f885da4188db4c6e6" + integrity sha512-Sr2fYMBUVGYq8kj3UthXFAu5UN6ZW+rYr4NACjZQJvHvj+c8lYv0CahmZ2P/r7iUkN44gGUBwqxZkrKXYPb7cw== dependencies: "@types/expect" "^1.20.4" "@types/node" "*" @@ -10043,10 +10043,10 @@ typescript@^4.7.4: resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.4.tgz#c464abca159669597be5f96b8943500b238e60e6" integrity sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ== -typescript@^5.5.0-dev.20240408: - version "5.5.0-dev.20240408" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.0-dev.20240408.tgz#337832c87cf0db5a11f9efcff9c789a982ea77c4" - integrity sha512-WCqFA68PbE0+khOu6x2LPxePy0tKdWuNO2m2K4A/L+OPqua1Qmck9OXUQ/5nUd4B/8UlBuhkhuulQbr2LHO9vA== +typescript@^5.5.0-dev.20240506: + version "5.5.0-dev.20240506" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.0-dev.20240506.tgz#d46aac8be07432092e3bd7e7fb7aae93b21d738a" + integrity sha512-0lnovJfyTASSjJvryIfT3sYDXAv1n2R0vujhtdXQiAxA+PRpCOTk7UqslELD6wl7t3s9hH5UI/+p5aPeSpmbYw== typical@^4.0.0: version "4.0.0"