diff --git a/lib/tsc.js b/lib/tsc.js index f1380f4ecf2ec..f7e464aa28ed8 100644 --- a/lib/tsc.js +++ b/lib/tsc.js @@ -18,7 +18,7 @@ and limitations under the License. // src/compiler/corePublic.ts var versionMajorMinor = "5.1"; -var version = "5.1.4"; +var version = "5.1.5"; // src/compiler/core.ts var emptyArray = []; @@ -60584,7 +60584,6 @@ function createTypeChecker(host) { } else if (targetFlags & 8388608 /* IndexedAccess */) { if (sourceFlags & 8388608 /* IndexedAccess */) { if (result2 = isRelatedTo(source2.objectType, target2.objectType, 3 /* Both */, reportErrors2)) { - instantiateType(source2.objectType, reportUnreliableMapper); result2 &= isRelatedTo(source2.indexType, target2.indexType, 3 /* Both */, reportErrors2); } if (result2) { diff --git a/lib/tsserver.js b/lib/tsserver.js index 0d87a1c790788..8c682afa1d190 100644 --- a/lib/tsserver.js +++ b/lib/tsserver.js @@ -2304,7 +2304,7 @@ module.exports = __toCommonJS(server_exports); // src/compiler/corePublic.ts var versionMajorMinor = "5.1"; -var version = "5.1.4"; +var version = "5.1.5"; var Comparison = /* @__PURE__ */ ((Comparison3) => { Comparison3[Comparison3["LessThan"] = -1] = "LessThan"; Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo"; @@ -65235,7 +65235,6 @@ function createTypeChecker(host) { } else if (targetFlags & 8388608 /* IndexedAccess */) { if (sourceFlags & 8388608 /* IndexedAccess */) { if (result2 = isRelatedTo(source2.objectType, target2.objectType, 3 /* Both */, reportErrors2)) { - instantiateType(source2.objectType, reportUnreliableMapper); result2 &= isRelatedTo(source2.indexType, target2.indexType, 3 /* Both */, reportErrors2); } if (result2) { @@ -156314,7 +156313,7 @@ function getSourceFromOrigin(origin) { } function getCompletionEntriesFromSymbols(symbols, entries, replacementToken, contextToken, location, position, sourceFile, host, program, target, log, kind, preferences, compilerOptions, formatContext, isTypeOnlyLocation, propertyAccessToConvert, jsxIdentifierExpected, isJsxInitializer, importStatementCompletion, recommendedCompletion, symbolToOriginInfoMap, symbolToSortTextMap, isJsxIdentifierExpected, isRightOfOpenTag, includeSymbol = false) { const start2 = timestamp(); - const variableOrParameterDeclaration = getVariableOrParameterDeclaration(contextToken); + const variableOrParameterDeclaration = getVariableOrParameterDeclaration(contextToken, location); const useSemicolons = probablyUsesSemicolons(sourceFile); const typeChecker = program.getTypeChecker(); const uniques = /* @__PURE__ */ new Map(); @@ -158493,11 +158492,12 @@ function isModuleSpecifierMissingOrEmpty(specifier) { return true; return !((_a = tryCast(isExternalModuleReference(specifier) ? specifier.expression : specifier, isStringLiteralLike)) == null ? void 0 : _a.text); } -function getVariableOrParameterDeclaration(contextToken) { +function getVariableOrParameterDeclaration(contextToken, location) { if (!contextToken) return; - const declaration = findAncestor(contextToken, (node) => isFunctionBlock(node) || isArrowFunctionBody(node) || isBindingPattern(node) ? "quit" : isVariableDeclaration(node) || (isParameter(node) || isTypeParameterDeclaration(node)) && !isIndexSignatureDeclaration(node.parent)); - return declaration; + const possiblyParameterDeclaration = findAncestor(contextToken, (node) => isFunctionBlock(node) || isArrowFunctionBody(node) || isBindingPattern(node) ? "quit" : (isParameter(node) || isTypeParameterDeclaration(node)) && !isIndexSignatureDeclaration(node.parent)); + const possiblyVariableDeclaration = findAncestor(location, (node) => isFunctionBlock(node) || isArrowFunctionBody(node) || isBindingPattern(node) ? "quit" : isVariableDeclaration(node)); + return possiblyParameterDeclaration || possiblyVariableDeclaration; } function isArrowFunctionBody(node) { return node.parent && isArrowFunction(node.parent) && (node.parent.body === node || // const a = () => /**/; @@ -158739,7 +158739,7 @@ function getStringLiteralCompletionEntries(sourceFile, node, position, typeCheck case 290 /* JsxAttribute */: if (!isRequireCallArgument(node) && !isImportCall(parent2)) { const argumentInfo = ts_SignatureHelp_exports.getArgumentInfoForCompletions(parent2.kind === 290 /* JsxAttribute */ ? parent2.parent : node, position, sourceFile); - return argumentInfo && getStringLiteralCompletionsFromSignature(argumentInfo.invocation, node, argumentInfo, typeChecker) || fromContextualType(); + return argumentInfo && getStringLiteralCompletionsFromSignature(argumentInfo.invocation, node, argumentInfo, typeChecker) || fromContextualType(0 /* None */); } case 271 /* ImportDeclaration */: case 277 /* ExportDeclaration */: diff --git a/lib/tsserverlibrary.d.ts b/lib/tsserverlibrary.d.ts index ca20adbcc9179..24685f553b407 100644 --- a/lib/tsserverlibrary.d.ts +++ b/lib/tsserverlibrary.d.ts @@ -5446,7 +5446,6 @@ declare namespace ts { type JsxAttributeValue = StringLiteral | JsxExpression | JsxElement | JsxSelfClosingElement | JsxFragment; interface JsxSpreadAttribute extends ObjectLiteralElement { readonly kind: SyntaxKind.JsxSpreadAttribute; - readonly name: PropertyName; readonly parent: JsxAttributes; readonly expression: Expression; } diff --git a/lib/tsserverlibrary.js b/lib/tsserverlibrary.js index b20060ffedcec..574e237d7c67f 100644 --- a/lib/tsserverlibrary.js +++ b/lib/tsserverlibrary.js @@ -35,7 +35,7 @@ var ts = (() => { "src/compiler/corePublic.ts"() { "use strict"; versionMajorMinor = "5.1"; - version = "5.1.4"; + version = "5.1.5"; Comparison = /* @__PURE__ */ ((Comparison3) => { Comparison3[Comparison3["LessThan"] = -1] = "LessThan"; Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo"; @@ -63026,7 +63026,6 @@ ${lanes.join("\n")} } else if (targetFlags & 8388608 /* IndexedAccess */) { if (sourceFlags & 8388608 /* IndexedAccess */) { if (result2 = isRelatedTo(source2.objectType, target2.objectType, 3 /* Both */, reportErrors2)) { - instantiateType(source2.objectType, reportUnreliableMapper); result2 &= isRelatedTo(source2.indexType, target2.indexType, 3 /* Both */, reportErrors2); } if (result2) { @@ -155546,7 +155545,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")} } function getCompletionEntriesFromSymbols(symbols, entries, replacementToken, contextToken, location, position, sourceFile, host, program, target, log, kind, preferences, compilerOptions, formatContext, isTypeOnlyLocation, propertyAccessToConvert, jsxIdentifierExpected, isJsxInitializer, importStatementCompletion, recommendedCompletion, symbolToOriginInfoMap, symbolToSortTextMap, isJsxIdentifierExpected, isRightOfOpenTag, includeSymbol = false) { const start = timestamp(); - const variableOrParameterDeclaration = getVariableOrParameterDeclaration(contextToken); + const variableOrParameterDeclaration = getVariableOrParameterDeclaration(contextToken, location); const useSemicolons = probablyUsesSemicolons(sourceFile); const typeChecker = program.getTypeChecker(); const uniques = /* @__PURE__ */ new Map(); @@ -157703,11 +157702,12 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")} return true; return !((_a = tryCast(isExternalModuleReference(specifier) ? specifier.expression : specifier, isStringLiteralLike)) == null ? void 0 : _a.text); } - function getVariableOrParameterDeclaration(contextToken) { + function getVariableOrParameterDeclaration(contextToken, location) { if (!contextToken) return; - const declaration = findAncestor(contextToken, (node) => isFunctionBlock(node) || isArrowFunctionBody(node) || isBindingPattern(node) ? "quit" : isVariableDeclaration(node) || (isParameter(node) || isTypeParameterDeclaration(node)) && !isIndexSignatureDeclaration(node.parent)); - return declaration; + const possiblyParameterDeclaration = findAncestor(contextToken, (node) => isFunctionBlock(node) || isArrowFunctionBody(node) || isBindingPattern(node) ? "quit" : (isParameter(node) || isTypeParameterDeclaration(node)) && !isIndexSignatureDeclaration(node.parent)); + const possiblyVariableDeclaration = findAncestor(location, (node) => isFunctionBlock(node) || isArrowFunctionBody(node) || isBindingPattern(node) ? "quit" : isVariableDeclaration(node)); + return possiblyParameterDeclaration || possiblyVariableDeclaration; } function isArrowFunctionBody(node) { return node.parent && isArrowFunction(node.parent) && (node.parent.body === node || // const a = () => /**/; @@ -158014,7 +158014,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")} case 290 /* JsxAttribute */: if (!isRequireCallArgument(node) && !isImportCall(parent2)) { const argumentInfo = ts_SignatureHelp_exports.getArgumentInfoForCompletions(parent2.kind === 290 /* JsxAttribute */ ? parent2.parent : node, position, sourceFile); - return argumentInfo && getStringLiteralCompletionsFromSignature(argumentInfo.invocation, node, argumentInfo, typeChecker) || fromContextualType(); + return argumentInfo && getStringLiteralCompletionsFromSignature(argumentInfo.invocation, node, argumentInfo, typeChecker) || fromContextualType(0 /* None */); } case 271 /* ImportDeclaration */: case 277 /* ExportDeclaration */: diff --git a/lib/typescript.d.ts b/lib/typescript.d.ts index 0dae9f82541a3..ff7896ef2664f 100644 --- a/lib/typescript.d.ts +++ b/lib/typescript.d.ts @@ -1398,7 +1398,6 @@ declare namespace ts { type JsxAttributeValue = StringLiteral | JsxExpression | JsxElement | JsxSelfClosingElement | JsxFragment; interface JsxSpreadAttribute extends ObjectLiteralElement { readonly kind: SyntaxKind.JsxSpreadAttribute; - readonly name: PropertyName; readonly parent: JsxAttributes; readonly expression: Expression; } diff --git a/lib/typescript.js b/lib/typescript.js index d56076c2ee5b6..9a9266cacf127 100644 --- a/lib/typescript.js +++ b/lib/typescript.js @@ -35,7 +35,7 @@ var ts = (() => { "src/compiler/corePublic.ts"() { "use strict"; versionMajorMinor = "5.1"; - version = "5.1.4"; + version = "5.1.5"; Comparison = /* @__PURE__ */ ((Comparison3) => { Comparison3[Comparison3["LessThan"] = -1] = "LessThan"; Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo"; @@ -63026,7 +63026,6 @@ ${lanes.join("\n")} } else if (targetFlags & 8388608 /* IndexedAccess */) { if (sourceFlags & 8388608 /* IndexedAccess */) { if (result2 = isRelatedTo(source2.objectType, target2.objectType, 3 /* Both */, reportErrors2)) { - instantiateType(source2.objectType, reportUnreliableMapper); result2 &= isRelatedTo(source2.indexType, target2.indexType, 3 /* Both */, reportErrors2); } if (result2) { @@ -155561,7 +155560,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")} } function getCompletionEntriesFromSymbols(symbols, entries, replacementToken, contextToken, location, position, sourceFile, host, program, target, log, kind, preferences, compilerOptions, formatContext, isTypeOnlyLocation, propertyAccessToConvert, jsxIdentifierExpected, isJsxInitializer, importStatementCompletion, recommendedCompletion, symbolToOriginInfoMap, symbolToSortTextMap, isJsxIdentifierExpected, isRightOfOpenTag, includeSymbol = false) { const start = timestamp(); - const variableOrParameterDeclaration = getVariableOrParameterDeclaration(contextToken); + const variableOrParameterDeclaration = getVariableOrParameterDeclaration(contextToken, location); const useSemicolons = probablyUsesSemicolons(sourceFile); const typeChecker = program.getTypeChecker(); const uniques = /* @__PURE__ */ new Map(); @@ -157718,11 +157717,12 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")} return true; return !((_a = tryCast(isExternalModuleReference(specifier) ? specifier.expression : specifier, isStringLiteralLike)) == null ? void 0 : _a.text); } - function getVariableOrParameterDeclaration(contextToken) { + function getVariableOrParameterDeclaration(contextToken, location) { if (!contextToken) return; - const declaration = findAncestor(contextToken, (node) => isFunctionBlock(node) || isArrowFunctionBody(node) || isBindingPattern(node) ? "quit" : isVariableDeclaration(node) || (isParameter(node) || isTypeParameterDeclaration(node)) && !isIndexSignatureDeclaration(node.parent)); - return declaration; + const possiblyParameterDeclaration = findAncestor(contextToken, (node) => isFunctionBlock(node) || isArrowFunctionBody(node) || isBindingPattern(node) ? "quit" : (isParameter(node) || isTypeParameterDeclaration(node)) && !isIndexSignatureDeclaration(node.parent)); + const possiblyVariableDeclaration = findAncestor(location, (node) => isFunctionBlock(node) || isArrowFunctionBody(node) || isBindingPattern(node) ? "quit" : isVariableDeclaration(node)); + return possiblyParameterDeclaration || possiblyVariableDeclaration; } function isArrowFunctionBody(node) { return node.parent && isArrowFunction(node.parent) && (node.parent.body === node || // const a = () => /**/; @@ -158029,7 +158029,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")} case 290 /* JsxAttribute */: if (!isRequireCallArgument(node) && !isImportCall(parent2)) { const argumentInfo = ts_SignatureHelp_exports.getArgumentInfoForCompletions(parent2.kind === 290 /* JsxAttribute */ ? parent2.parent : node, position, sourceFile); - return argumentInfo && getStringLiteralCompletionsFromSignature(argumentInfo.invocation, node, argumentInfo, typeChecker) || fromContextualType(); + return argumentInfo && getStringLiteralCompletionsFromSignature(argumentInfo.invocation, node, argumentInfo, typeChecker) || fromContextualType(0 /* None */); } case 271 /* ImportDeclaration */: case 277 /* ExportDeclaration */: diff --git a/lib/typingsInstaller.js b/lib/typingsInstaller.js index d3cf1506449e9..a668ca7364c02 100644 --- a/lib/typingsInstaller.js +++ b/lib/typingsInstaller.js @@ -54,7 +54,7 @@ var path = __toESM(require("path")); // src/compiler/corePublic.ts var versionMajorMinor = "5.1"; -var version = "5.1.4"; +var version = "5.1.5"; // src/compiler/core.ts var emptyArray = []; diff --git a/package.json b/package.json index d364bedf7b6e1..164ad0ae67627 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "typescript", "author": "Microsoft Corp.", "homepage": "https://www.typescriptlang.org/", - "version": "5.1.4", + "version": "5.1.5", "license": "Apache-2.0", "description": "TypeScript is a language for application scale JavaScript development", "keywords": [ diff --git a/src/compiler/corePublic.ts b/src/compiler/corePublic.ts index 4e01d23815da8..934c20d2e2c5f 100644 --- a/src/compiler/corePublic.ts +++ b/src/compiler/corePublic.ts @@ -4,7 +4,7 @@ export const versionMajorMinor = "5.1"; // The following is baselined as a literal template type without intervention /** The version of the TypeScript compiler release */ // eslint-disable-next-line @typescript-eslint/no-inferrable-types -export const version = "5.1.4" as string; +export const version = "5.1.5" as string; /** * Type of objects whose values are all of the same type.