Pick up latest TS for building VS Code (microsoft#172033)

Author: mjbvz

build/lib/i18n.js

@@ -115,7 +115,7 @@ function getNodeText(sourceFile: ts.SourceFile, node: { pos: number; end: number
 	return sourceFile.getFullText().substring(node.pos, node.end);
 }
 
-function hasModifier(modifiers: ts.NodeArray<ts.ModifierLike> | undefined, kind: ts.SyntaxKind): boolean {
+function hasModifier(modifiers: readonly ts.ModifierLike[] | undefined, kind: ts.SyntaxKind): boolean {
 	if (modifiers) {
 		for (let i = 0; i < modifiers.length; i++) {
 			const mod = modifiers[i];
@@ -128,7 +128,10 @@ function hasModifier(modifiers: ts.NodeArray<ts.ModifierLike> | undefined, kind:
 }
 
 function isStatic(ts: typeof import('typescript'), member: ts.ClassElement | ts.TypeElement): boolean {
-	return hasModifier(member.modifiers, ts.SyntaxKind.StaticKeyword);
+	if (ts.canHaveModifiers(member)) {
+		return hasModifier(ts.getModifiers(member), ts.SyntaxKind.StaticKeyword);
+	}
+	return false;
 }
 
 function isDefaultExport(ts: typeof import('typescript'), declaration: ts.InterfaceDeclaration | ts.ClassDeclaration): boolean {

build/lib/monaco-api.js

@@ -209,7 +209,7 @@
     "ts-loader": "^9.2.7",
     "ts-node": "^10.9.1",
     "tsec": "0.1.4",
-    "typescript": "^5.0.0-dev.20230117",
+    "typescript": "^5.0.0-dev.20230123",
     "typescript-formatter": "7.1.0",
     "underscore": "^1.12.1",
     "util": "^0.12.4",
@@ -239,4 +239,4 @@
     "elliptic": "^6.5.3",
     "nwmatcher": "^1.4.4"
   }
-}
+}

build/lib/monaco-api.ts

@@ -207,7 +207,7 @@ export class IndentGuidesOverlay extends DynamicViewOverlay {
 			const bracketGuidesInLine = bracketGuides ? bracketGuides[lineNumber - visibleStartLineNumber] : [];
 			const bracketGuidesInLineQueue = new ArrayQueue(bracketGuidesInLine);
 
-			const indentGuidesInLine = indentGuides ? indentGuides[lineNumber - visibleStartLineNumber] : [];
+			const indentGuidesInLine = indentGuides ? indentGuides[lineNumber - visibleStartLineNumber] : 0;
 
 			for (let indentLvl = 1; indentLvl <= indentGuidesInLine; indentLvl++) {
 				const indentGuide = (indentLvl - 1) * indentSize + 1;

build/lib/tsb/transpiler.js

@@ -195,10 +195,7 @@ export class ModelService extends Disposable implements IModelService {
 		if (config.editor && typeof config.editor.indentSize !== 'undefined' && config.editor.indentSize !== 'tabSize') {
 			const parsedIndentSize = parseInt(config.editor.indentSize, 10);
 			if (!isNaN(parsedIndentSize)) {
-				indentSize = parsedIndentSize;
-			}
-			if (indentSize < 1) {
-				indentSize = 1;
+				indentSize = Math.max(parsedIndentSize, 1);
 			}
 		}
 

package.json

@@ -220,7 +220,7 @@ export abstract class AbstractExtensionsProfileScannerService extends Disposable
 			let extensions: IScannedProfileExtension[] = [];
 
 			// Read
-			let storedProfileExtensions;
+			let storedProfileExtensions: IStoredProfileExtension[] | undefined;
 			try {
 				const content = await this.fileService.readFile(file);
 				storedProfileExtensions = JSON.parse(content.value.toString());

src/vs/editor/browser/viewParts/indentGuides/indentGuides.ts

@@ -5,7 +5,6 @@
 
 import { Readable, ReadableStream, newWriteableStream, listenStream } from 'vs/base/common/stream';
 import { VSBuffer, VSBufferReadable, VSBufferReadableStream } from 'vs/base/common/buffer';
-import { IDisposable } from 'vs/base/common/lifecycle';
 
 export const UTF8 = 'utf8';
 export const UTF8_with_bom = 'utf8bom';
@@ -123,7 +122,6 @@ export function toDecodeStream(source: VSBufferReadableStream, options: IDecodeS
 		let bytesBuffered = 0;
 
 		let decoder: IDecoderStream | undefined = undefined;
-		let sourceListener: IDisposable | undefined = undefined;
 
 		const createDecoder = async () => {
 			try {
@@ -166,7 +164,7 @@ export function toDecodeStream(source: VSBufferReadableStream, options: IDecodeS
 			}
 		};
 
-		sourceListener = listenStream(source, {
+		const sourceListener = listenStream(source, {
 			onData: async chunk => {
 
 				// if the decoder is ready, we just write directly

src/vs/editor/common/services/modelService.ts

@@ -10901,10 +10901,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.0.0-dev.20230117:
-  version "5.0.0-dev.20230117"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.0.0-dev.20230117.tgz#e7748dd2e5b2306d28cb879372c1b12253fd111e"
-  integrity sha512-t4oWIiyz6CecNWyma3JrWhQttymyjEjU22fblThjweyNJHzgScOrKO6TYWZmJT4vbi486mTLLu5ologS69czow==
+typescript@^5.0.0-dev.20230123:
+  version "5.0.0-dev.20230123"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.0.0-dev.20230123.tgz#fba513ac2c835a9f059711a5059f90a687fa8046"
+  integrity sha512-edLR1yM+/2DAL3tZNDtoXLoe2ks7VOYxLUafJMswhWrvpzN4YDNy76zpYORpufCNBn32V5aYA48P0Wkk4U4Ugg==
 
 typical@^4.0.0:
   version "4.0.0"