diff --git a/build/lib/util.ts b/build/lib/util.ts index 2511f987fbc..9716be2290a 100644 --- a/build/lib/util.ts +++ b/build/lib/util.ts @@ -207,8 +207,8 @@ export function loadSourcemaps(): NodeJS.ReadWriteStream { const contents = (f.contents).toString('utf8'); const reg = /\/\/# sourceMappingURL=(.*)$/g; - let lastMatch: RegExpMatchArray | null = null; - let match: RegExpMatchArray | null = null; + let lastMatch: RegExpExecArray | null = null; + let match: RegExpExecArray | null = null; while (match = reg.exec(contents)) { lastMatch = match; diff --git a/extensions/git/src/git.ts b/extensions/git/src/git.ts index 5cb944783a7..392ec661728 100644 --- a/extensions/git/src/git.ts +++ b/extensions/git/src/git.ts @@ -427,7 +427,7 @@ export class Git { let previousProgress = 0; lineStream.on('data', (line: string) => { - let match: RegExpMatchArray | null = null; + let match: RegExpExecArray | null = null; if (match = /Counting objects:\s*(\d+)%/i.exec(line)) { totalProgress = Math.floor(parseInt(match[1]) * 0.1); diff --git a/package.json b/package.json index f2e233feecc..43ba684d476 100644 --- a/package.json +++ b/package.json @@ -201,7 +201,7 @@ "style-loader": "^1.3.0", "ts-loader": "^9.2.7", "tsec": "0.1.4", - "typescript": "^4.9.0-dev.20220811", + "typescript": "^4.9.0-dev.20220825", "typescript-formatter": "7.1.0", "underscore": "^1.12.1", "util": "^0.12.4", diff --git a/src/vs/base/browser/ui/iconLabel/iconLabels.ts b/src/vs/base/browser/ui/iconLabel/iconLabels.ts index 103bca257a5..4fe1a5c79e8 100644 --- a/src/vs/base/browser/ui/iconLabel/iconLabels.ts +++ b/src/vs/base/browser/ui/iconLabel/iconLabels.ts @@ -9,7 +9,7 @@ import { CSSIcon } from 'vs/base/common/codicons'; const labelWithIconsRegex = new RegExp(`(\\\\)?\\$\\((${CSSIcon.iconNameExpression}(?:${CSSIcon.iconModifierExpression})?)\\)`, 'g'); export function renderLabelWithIcons(text: string): Array { const elements = new Array(); - let match: RegExpMatchArray | null; + let match: RegExpExecArray | null; let textStart = 0, textStop = 0; while ((match = labelWithIconsRegex.exec(text)) !== null) { diff --git a/src/vs/editor/common/core/wordHelper.ts b/src/vs/editor/common/core/wordHelper.ts index a4051dc26e8..cdb2d4b8bfb 100644 --- a/src/vs/editor/common/core/wordHelper.ts +++ b/src/vs/editor/common/core/wordHelper.ts @@ -118,7 +118,7 @@ export function getWordAtText(column: number, wordDefinition: RegExp, text: stri const pos = column - 1 - textOffset; let prevRegexIndex = -1; - let match: RegExpMatchArray | null = null; + let match: RegExpExecArray | null = null; for (let i = 1; ; i++) { // check time budget @@ -159,8 +159,8 @@ export function getWordAtText(column: number, wordDefinition: RegExp, text: stri return null; } -function _findRegexMatchEnclosingPosition(wordDefinition: RegExp, text: string, pos: number, stopPos: number): RegExpMatchArray | null { - let match: RegExpMatchArray | null; +function _findRegexMatchEnclosingPosition(wordDefinition: RegExp, text: string, pos: number, stopPos: number): RegExpExecArray | null { + let match: RegExpExecArray | null; while (match = wordDefinition.exec(text)) { const matchIndex = match.index || 0; if (matchIndex <= pos && wordDefinition.lastIndex >= pos) { diff --git a/yarn.lock b/yarn.lock index 76c096b796a..c408f749974 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10559,10 +10559,10 @@ typescript@^2.6.2: resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.6.2.tgz#3c5b6fd7f6de0914269027f03c0946758f7673a4" integrity sha1-PFtv1/beCRQmkCfwPAlGdY92c6Q= -typescript@^4.9.0-dev.20220811: - version "4.9.0-dev.20220811" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.0-dev.20220811.tgz#0288fb9a8779d31a72761faa889068a69020825e" - integrity sha512-lkZioCre43Re1dP8vyGO1T/opJ6F28pGHb3L96NOuziyPDhcHkSluRc7YQ17qrSHPaL0eyEyXXgvYJ+lNoO7yQ== +typescript@^4.9.0-dev.20220825: + version "4.9.0-dev.20220825" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.0-dev.20220825.tgz#3ba3a74c3f3ba9d3dd9a80a5d785549f85018c05" + integrity sha512-X6bFdJycFPfp4CC8RqOZkCQauNIayamosrtovm6UlCjez9AKMQ1TQJiwReDybks9TGHR3LegEIvLIMWj+uiHYg== typical@^4.0.0: version "4.0.0"