typescript 5.2.0-dev.20230630 → 5.2.0-dev.20230702

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.2";
-var version = `${versionMajorMinor}.0-dev.20230630`;
+var version = `${versionMajorMinor}.0-dev.20230702`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -7465,6 +7465,7 @@ var Diagnostics = {
   Parameter_modifiers_can_only_be_used_in_TypeScript_files: diag(8012, 1 /* Error */, "Parameter_modifiers_can_only_be_used_in_TypeScript_files_8012", "Parameter modifiers can only be used in TypeScript files."),
   Non_null_assertions_can_only_be_used_in_TypeScript_files: diag(8013, 1 /* Error */, "Non_null_assertions_can_only_be_used_in_TypeScript_files_8013", "Non-null assertions can only be used in TypeScript files."),
   Type_assertion_expressions_can_only_be_used_in_TypeScript_files: diag(8016, 1 /* Error */, "Type_assertion_expressions_can_only_be_used_in_TypeScript_files_8016", "Type assertion expressions can only be used in TypeScript files."),
+  Signature_declarations_can_only_be_used_in_TypeScript_files: diag(8017, 1 /* Error */, "Signature_declarations_can_only_be_used_in_TypeScript_files_8017", "Signature declarations can only be used in TypeScript files."),
   Report_errors_in_js_files: diag(8019, 3 /* Message */, "Report_errors_in_js_files_8019", "Report errors in .js files."),
   JSDoc_types_can_only_be_used_inside_documentation_comments: diag(8020, 1 /* Error */, "JSDoc_types_can_only_be_used_inside_documentation_comments_8020", "JSDoc types can only be used inside documentation comments."),
   JSDoc_typedef_tag_should_either_have_a_type_annotation_or_be_followed_by_property_or_member_tags: diag(8021, 1 /* Error */, "JSDoc_typedef_tag_should_either_have_a_type_annotation_or_be_followed_by_property_or_member_tags_8021", "JSDoc '@typedef' tag should either have a type annotation or be followed by '@property' or '@member' tags."),
@@ -26594,7 +26595,8 @@ var Parser;
     nextToken();
     const statements = parseList(0 /* SourceElements */, parseStatement);
     Debug.assert(token() === 1 /* EndOfFileToken */);
-    const endOfFileToken = addJSDocComment(parseTokenNode());
+    const endHasJSDoc = hasPrecedingJSDocComment();
+    const endOfFileToken = withJSDoc(parseTokenNode(), endHasJSDoc);
     const sourceFile = createSourceFile2(fileName, languageVersion2, scriptKind2, isDeclarationFile, statements, endOfFileToken, sourceFlags, setExternalModuleIndicator2);
     processCommentPragmas(sourceFile, sourceText);
     processPragmasIntoFields(sourceFile, reportPragmaDiagnostic);
@@ -26614,11 +26616,11 @@ var Parser;
       parseDiagnostics.push(createDetachedDiagnostic(fileName, pos, end, diagnostic));
     }
   }
-  function withJSDoc(node, hasJSDoc) {
-    return hasJSDoc ? addJSDocComment(node) : node;
-  }
   let hasDeprecatedTag = false;
-  function addJSDocComment(node) {
+  function withJSDoc(node, hasJSDoc) {
+    if (!hasJSDoc) {
+      return node;
+    }
     Debug.assert(!node.jsDoc);
     const jsDoc = mapDefined(getJSDocCommentRanges(node, sourceText), (comment) => JSDocParser.parseJSDocComment(node, comment.pos, comment.end - comment.pos));
     if (jsDoc.length)
@@ -29133,12 +29135,14 @@ var Parser;
       return arrowExpression;
     }
     const pos = getNodePos();
+    const hasJSDoc = hasPrecedingJSDocComment();
     const expr = parseBinaryExpressionOrHigher(0 /* Lowest */);
     if (expr.kind === 80 /* Identifier */ && token() === 39 /* EqualsGreaterThanToken */) {
       return parseSimpleArrowFunctionExpression(
         pos,
         expr,
         allowReturnTypeInArrowFunction,
+        hasJSDoc,
         /*asyncModifier*/
         void 0
       );
@@ -29184,7 +29188,7 @@ var Parser;
       ), pos);
     }
   }
-  function parseSimpleArrowFunctionExpression(pos, identifier, allowReturnTypeInArrowFunction, asyncModifier) {
+  function parseSimpleArrowFunctionExpression(pos, identifier, allowReturnTypeInArrowFunction, hasJSDoc, asyncModifier) {
     Debug.assert(token() === 39 /* EqualsGreaterThanToken */, "parseSimpleArrowFunctionExpression should only have been called if we had a =>");
     const parameter = factory2.createParameterDeclaration(
       /*modifiers*/
@@ -29217,7 +29221,7 @@ var Parser;
       equalsGreaterThanToken,
       body
     );
-    return addJSDocComment(finishNode(node, pos));
+    return withJSDoc(finishNode(node, pos), hasJSDoc);
   }
   function tryParseParenthesizedArrowFunctionExpression(allowReturnTypeInArrowFunction) {
     const triState = isParenthesizedArrowFunctionExpression();
@@ -29345,9 +29349,10 @@ var Parser;
     if (token() === 134 /* AsyncKeyword */) {
       if (lookAhead(isUnParenthesizedAsyncArrowFunctionWorker) === 1 /* True */) {
         const pos = getNodePos();
+        const hasJSDoc = hasPrecedingJSDocComment();
         const asyncModifier = parseModifiersForArrowFunction();
         const expr = parseBinaryExpressionOrHigher(0 /* Lowest */);
-        return parseSimpleArrowFunctionExpression(pos, expr, allowReturnTypeInArrowFunction, asyncModifier);
+        return parseSimpleArrowFunctionExpression(pos, expr, allowReturnTypeInArrowFunction, hasJSDoc, asyncModifier);
       }
     }
     return void 0;
@@ -116473,6 +116478,14 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
           case 265 /* TypeAliasDeclaration */:
             diagnostics.push(createDiagnosticForNode2(node, Diagnostics.Type_aliases_can_only_be_used_in_TypeScript_files));
             return "skip";
+          case 176 /* Constructor */:
+          case 174 /* MethodDeclaration */:
+          case 262 /* FunctionDeclaration */:
+            if (!node.body) {
+              diagnostics.push(createDiagnosticForNode2(node, Diagnostics.Signature_declarations_can_only_be_used_in_TypeScript_files));
+              return "skip";
+            }
+            return;
           case 266 /* EnumDeclaration */:
             const enumKeyword = Debug.checkDefined(tokenToString(94 /* EnumKeyword */));
             diagnostics.push(createDiagnosticForNode2(node, Diagnostics._0_declarations_can_only_be_used_in_TypeScript_files, enumKeyword));

package/lib/tsserver.js

@@ -2327,7 +2327,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.2";
-var version = `${versionMajorMinor}.0-dev.20230630`;
+var version = `${versionMajorMinor}.0-dev.20230702`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -10986,6 +10986,7 @@ var Diagnostics = {
   Parameter_modifiers_can_only_be_used_in_TypeScript_files: diag(8012, 1 /* Error */, "Parameter_modifiers_can_only_be_used_in_TypeScript_files_8012", "Parameter modifiers can only be used in TypeScript files."),
   Non_null_assertions_can_only_be_used_in_TypeScript_files: diag(8013, 1 /* Error */, "Non_null_assertions_can_only_be_used_in_TypeScript_files_8013", "Non-null assertions can only be used in TypeScript files."),
   Type_assertion_expressions_can_only_be_used_in_TypeScript_files: diag(8016, 1 /* Error */, "Type_assertion_expressions_can_only_be_used_in_TypeScript_files_8016", "Type assertion expressions can only be used in TypeScript files."),
+  Signature_declarations_can_only_be_used_in_TypeScript_files: diag(8017, 1 /* Error */, "Signature_declarations_can_only_be_used_in_TypeScript_files_8017", "Signature declarations can only be used in TypeScript files."),
   Report_errors_in_js_files: diag(8019, 3 /* Message */, "Report_errors_in_js_files_8019", "Report errors in .js files."),
   JSDoc_types_can_only_be_used_inside_documentation_comments: diag(8020, 1 /* Error */, "JSDoc_types_can_only_be_used_inside_documentation_comments_8020", "JSDoc types can only be used inside documentation comments."),
   JSDoc_typedef_tag_should_either_have_a_type_annotation_or_be_followed_by_property_or_member_tags: diag(8021, 1 /* Error */, "JSDoc_typedef_tag_should_either_have_a_type_annotation_or_be_followed_by_property_or_member_tags_8021", "JSDoc '@typedef' tag should either have a type annotation or be followed by '@property' or '@member' tags."),
@@ -30992,7 +30993,8 @@ var Parser;
     nextToken();
     const statements = parseList(0 /* SourceElements */, parseStatement);
     Debug.assert(token() === 1 /* EndOfFileToken */);
-    const endOfFileToken = addJSDocComment(parseTokenNode());
+    const endHasJSDoc = hasPrecedingJSDocComment();
+    const endOfFileToken = withJSDoc(parseTokenNode(), endHasJSDoc);
     const sourceFile = createSourceFile2(fileName, languageVersion2, scriptKind2, isDeclarationFile, statements, endOfFileToken, sourceFlags, setExternalModuleIndicator2);
     processCommentPragmas(sourceFile, sourceText);
     processPragmasIntoFields(sourceFile, reportPragmaDiagnostic);
@@ -31012,11 +31014,11 @@ var Parser;
       parseDiagnostics.push(createDetachedDiagnostic(fileName, pos, end, diagnostic));
     }
   }
-  function withJSDoc(node, hasJSDoc) {
-    return hasJSDoc ? addJSDocComment(node) : node;
-  }
   let hasDeprecatedTag = false;
-  function addJSDocComment(node) {
+  function withJSDoc(node, hasJSDoc) {
+    if (!hasJSDoc) {
+      return node;
+    }
     Debug.assert(!node.jsDoc);
     const jsDoc = mapDefined(getJSDocCommentRanges(node, sourceText), (comment) => JSDocParser.parseJSDocComment(node, comment.pos, comment.end - comment.pos));
     if (jsDoc.length)
@@ -33531,12 +33533,14 @@ var Parser;
       return arrowExpression;
     }
     const pos = getNodePos();
+    const hasJSDoc = hasPrecedingJSDocComment();
     const expr = parseBinaryExpressionOrHigher(0 /* Lowest */);
     if (expr.kind === 80 /* Identifier */ && token() === 39 /* EqualsGreaterThanToken */) {
       return parseSimpleArrowFunctionExpression(
         pos,
         expr,
         allowReturnTypeInArrowFunction,
+        hasJSDoc,
         /*asyncModifier*/
         void 0
       );
@@ -33582,7 +33586,7 @@ var Parser;
       ), pos);
     }
   }
-  function parseSimpleArrowFunctionExpression(pos, identifier, allowReturnTypeInArrowFunction, asyncModifier) {
+  function parseSimpleArrowFunctionExpression(pos, identifier, allowReturnTypeInArrowFunction, hasJSDoc, asyncModifier) {
     Debug.assert(token() === 39 /* EqualsGreaterThanToken */, "parseSimpleArrowFunctionExpression should only have been called if we had a =>");
     const parameter = factory2.createParameterDeclaration(
       /*modifiers*/
@@ -33615,7 +33619,7 @@ var Parser;
       equalsGreaterThanToken,
       body
     );
-    return addJSDocComment(finishNode(node, pos));
+    return withJSDoc(finishNode(node, pos), hasJSDoc);
   }
   function tryParseParenthesizedArrowFunctionExpression(allowReturnTypeInArrowFunction) {
     const triState = isParenthesizedArrowFunctionExpression();
@@ -33743,9 +33747,10 @@ var Parser;
     if (token() === 134 /* AsyncKeyword */) {
       if (lookAhead(isUnParenthesizedAsyncArrowFunctionWorker) === 1 /* True */) {
         const pos = getNodePos();
+        const hasJSDoc = hasPrecedingJSDocComment();
         const asyncModifier = parseModifiersForArrowFunction();
         const expr = parseBinaryExpressionOrHigher(0 /* Lowest */);
-        return parseSimpleArrowFunctionExpression(pos, expr, allowReturnTypeInArrowFunction, asyncModifier);
+        return parseSimpleArrowFunctionExpression(pos, expr, allowReturnTypeInArrowFunction, hasJSDoc, asyncModifier);
       }
     }
     return void 0;
@@ -121385,6 +121390,14 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
           case 265 /* TypeAliasDeclaration */:
             diagnostics.push(createDiagnosticForNode2(node, Diagnostics.Type_aliases_can_only_be_used_in_TypeScript_files));
             return "skip";
+          case 176 /* Constructor */:
+          case 174 /* MethodDeclaration */:
+          case 262 /* FunctionDeclaration */:
+            if (!node.body) {
+              diagnostics.push(createDiagnosticForNode2(node, Diagnostics.Signature_declarations_can_only_be_used_in_TypeScript_files));
+              return "skip";
+            }
+            return;
           case 266 /* EnumDeclaration */:
             const enumKeyword = Debug.checkDefined(tokenToString(94 /* EnumKeyword */));
             diagnostics.push(createDiagnosticForNode2(node, Diagnostics._0_declarations_can_only_be_used_in_TypeScript_files, enumKeyword));
@@ -157667,6 +157680,13 @@ function createCompletionEntry(symbol, sortText, replacementToken, contextToken,
     data = originToCompletionEntryData(origin);
     hasAction = !importStatementCompletion;
   }
+  const parentNamedImportOrExport = findAncestor(location, isNamedImportsOrExports);
+  if ((parentNamedImportOrExport == null ? void 0 : parentNamedImportOrExport.kind) === 275 /* NamedImports */) {
+    const possibleToken = stringToToken(name);
+    if (parentNamedImportOrExport && possibleToken && (possibleToken === 135 /* AwaitKeyword */ || isNonContextualKeyword(possibleToken))) {
+      insertText = `${name} as ${name}_`;
+    }
+  }
   return {
     name,
     kind: ts_SymbolDisplay_exports.getSymbolKind(typeChecker, symbol, location),
@@ -158447,7 +158467,7 @@ function createCompletionDetails(name, kindModifiers, kind, displayParts, docume
 }
 function getCompletionEntryCodeActionsAndSourceDisplay(name, location, contextToken, origin, symbol, program, host, compilerOptions, sourceFile, position, previousToken, formatContext, preferences, data, source, cancellationToken) {
   if (data == null ? void 0 : data.moduleSpecifier) {
-    if (previousToken && getImportStatementCompletionInfo(contextToken || previousToken).replacementSpan) {
+    if (previousToken && getImportStatementCompletionInfo(contextToken || previousToken, sourceFile).replacementSpan) {
       return { codeActions: void 0, sourceDisplay: [textPart(data.moduleSpecifier)] };
     }
   }
@@ -158669,7 +158689,7 @@ function getCompletionData(program, log, sourceFile, compilerOptions, position,
   let isNewIdentifierLocation = false;
   let flags = 0 /* None */;
   if (contextToken) {
-    const importStatementCompletionInfo = getImportStatementCompletionInfo(contextToken);
+    const importStatementCompletionInfo = getImportStatementCompletionInfo(contextToken, sourceFile);
     if (importStatementCompletionInfo.keywordCompletion) {
       if (importStatementCompletionInfo.isKeywordOnlyCompletion) {
         return {
@@ -160313,7 +160333,7 @@ function tryGetObjectLiteralContextualType(node, typeChecker) {
   }
   return void 0;
 }
-function getImportStatementCompletionInfo(contextToken) {
+function getImportStatementCompletionInfo(contextToken, sourceFile) {
   var _a, _b, _c;
   let keywordCompletion;
   let isKeywordOnlyCompletion = false;
@@ -160329,6 +160349,12 @@ function getImportStatementCompletionInfo(contextToken) {
   function getCandidate() {
     const parent2 = contextToken.parent;
     if (isImportEqualsDeclaration(parent2)) {
+      const lastToken = parent2.getLastToken(sourceFile);
+      if (isIdentifier(contextToken) && lastToken !== contextToken) {
+        keywordCompletion = 161 /* FromKeyword */;
+        isKeywordOnlyCompletion = true;
+        return void 0;
+      }
       keywordCompletion = contextToken.kind === 156 /* TypeKeyword */ ? void 0 : 156 /* TypeKeyword */;
       return isModuleSpecifierMissingOrEmpty(parent2.moduleReference) ? parent2 : void 0;
     }
@@ -160830,7 +160856,7 @@ function getCompletionEntriesForRelativeModules(literalValue, scriptDirectory, c
       extensionOptions,
       host,
       /*moduleSpecifierIsRelative*/
-      false,
+      true,
       scriptPath
     ).values());
   }

package/lib/tsserverlibrary.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.2";
-      version = `${versionMajorMinor}.0-dev.20230630`;
+      version = `${versionMajorMinor}.0-dev.20230702`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -8769,6 +8769,7 @@ ${lanes.join("\n")}
         Parameter_modifiers_can_only_be_used_in_TypeScript_files: diag(8012, 1 /* Error */, "Parameter_modifiers_can_only_be_used_in_TypeScript_files_8012", "Parameter modifiers can only be used in TypeScript files."),
         Non_null_assertions_can_only_be_used_in_TypeScript_files: diag(8013, 1 /* Error */, "Non_null_assertions_can_only_be_used_in_TypeScript_files_8013", "Non-null assertions can only be used in TypeScript files."),
         Type_assertion_expressions_can_only_be_used_in_TypeScript_files: diag(8016, 1 /* Error */, "Type_assertion_expressions_can_only_be_used_in_TypeScript_files_8016", "Type assertion expressions can only be used in TypeScript files."),
+        Signature_declarations_can_only_be_used_in_TypeScript_files: diag(8017, 1 /* Error */, "Signature_declarations_can_only_be_used_in_TypeScript_files_8017", "Signature declarations can only be used in TypeScript files."),
         Report_errors_in_js_files: diag(8019, 3 /* Message */, "Report_errors_in_js_files_8019", "Report errors in .js files."),
         JSDoc_types_can_only_be_used_inside_documentation_comments: diag(8020, 1 /* Error */, "JSDoc_types_can_only_be_used_inside_documentation_comments_8020", "JSDoc types can only be used inside documentation comments."),
         JSDoc_typedef_tag_should_either_have_a_type_annotation_or_be_followed_by_property_or_member_tags: diag(8021, 1 /* Error */, "JSDoc_typedef_tag_should_either_have_a_type_annotation_or_be_followed_by_property_or_member_tags_8021", "JSDoc '@typedef' tag should either have a type annotation or be followed by '@property' or '@member' tags."),
@@ -29065,7 +29066,8 @@ ${lanes.join("\n")}
           nextToken();
           const statements = parseList(0 /* SourceElements */, parseStatement);
           Debug.assert(token() === 1 /* EndOfFileToken */);
-          const endOfFileToken = addJSDocComment(parseTokenNode());
+          const endHasJSDoc = hasPrecedingJSDocComment();
+          const endOfFileToken = withJSDoc(parseTokenNode(), endHasJSDoc);
           const sourceFile = createSourceFile2(fileName, languageVersion2, scriptKind2, isDeclarationFile, statements, endOfFileToken, sourceFlags, setExternalModuleIndicator2);
           processCommentPragmas(sourceFile, sourceText);
           processPragmasIntoFields(sourceFile, reportPragmaDiagnostic);
@@ -29085,11 +29087,11 @@ ${lanes.join("\n")}
             parseDiagnostics.push(createDetachedDiagnostic(fileName, pos, end, diagnostic));
           }
         }
-        function withJSDoc(node, hasJSDoc) {
-          return hasJSDoc ? addJSDocComment(node) : node;
-        }
         let hasDeprecatedTag = false;
-        function addJSDocComment(node) {
+        function withJSDoc(node, hasJSDoc) {
+          if (!hasJSDoc) {
+            return node;
+          }
           Debug.assert(!node.jsDoc);
           const jsDoc = mapDefined(getJSDocCommentRanges(node, sourceText), (comment) => JSDocParser.parseJSDocComment(node, comment.pos, comment.end - comment.pos));
           if (jsDoc.length)
@@ -31604,12 +31606,14 @@ ${lanes.join("\n")}
             return arrowExpression;
           }
           const pos = getNodePos();
+          const hasJSDoc = hasPrecedingJSDocComment();
           const expr = parseBinaryExpressionOrHigher(0 /* Lowest */);
           if (expr.kind === 80 /* Identifier */ && token() === 39 /* EqualsGreaterThanToken */) {
             return parseSimpleArrowFunctionExpression(
               pos,
               expr,
               allowReturnTypeInArrowFunction,
+              hasJSDoc,
               /*asyncModifier*/
               void 0
             );
@@ -31655,7 +31659,7 @@ ${lanes.join("\n")}
             ), pos);
           }
         }
-        function parseSimpleArrowFunctionExpression(pos, identifier, allowReturnTypeInArrowFunction, asyncModifier) {
+        function parseSimpleArrowFunctionExpression(pos, identifier, allowReturnTypeInArrowFunction, hasJSDoc, asyncModifier) {
           Debug.assert(token() === 39 /* EqualsGreaterThanToken */, "parseSimpleArrowFunctionExpression should only have been called if we had a =>");
           const parameter = factory2.createParameterDeclaration(
             /*modifiers*/
@@ -31688,7 +31692,7 @@ ${lanes.join("\n")}
             equalsGreaterThanToken,
             body
           );
-          return addJSDocComment(finishNode(node, pos));
+          return withJSDoc(finishNode(node, pos), hasJSDoc);
         }
         function tryParseParenthesizedArrowFunctionExpression(allowReturnTypeInArrowFunction) {
           const triState = isParenthesizedArrowFunctionExpression();
@@ -31816,9 +31820,10 @@ ${lanes.join("\n")}
           if (token() === 134 /* AsyncKeyword */) {
             if (lookAhead(isUnParenthesizedAsyncArrowFunctionWorker) === 1 /* True */) {
               const pos = getNodePos();
+              const hasJSDoc = hasPrecedingJSDocComment();
               const asyncModifier = parseModifiersForArrowFunction();
               const expr = parseBinaryExpressionOrHigher(0 /* Lowest */);
-              return parseSimpleArrowFunctionExpression(pos, expr, allowReturnTypeInArrowFunction, asyncModifier);
+              return parseSimpleArrowFunctionExpression(pos, expr, allowReturnTypeInArrowFunction, hasJSDoc, asyncModifier);
             }
           }
           return void 0;
@@ -119371,6 +119376,14 @@ ${lanes.join("\n")}
             case 265 /* TypeAliasDeclaration */:
               diagnostics.push(createDiagnosticForNode2(node, Diagnostics.Type_aliases_can_only_be_used_in_TypeScript_files));
               return "skip";
+            case 176 /* Constructor */:
+            case 174 /* MethodDeclaration */:
+            case 262 /* FunctionDeclaration */:
+              if (!node.body) {
+                diagnostics.push(createDiagnosticForNode2(node, Diagnostics.Signature_declarations_can_only_be_used_in_TypeScript_files));
+                return "skip";
+              }
+              return;
             case 266 /* EnumDeclaration */:
               const enumKeyword = Debug.checkDefined(tokenToString(94 /* EnumKeyword */));
               diagnostics.push(createDiagnosticForNode2(node, Diagnostics._0_declarations_can_only_be_used_in_TypeScript_files, enumKeyword));
@@ -156899,6 +156912,13 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       data = originToCompletionEntryData(origin);
       hasAction = !importStatementCompletion;
     }
+    const parentNamedImportOrExport = findAncestor(location, isNamedImportsOrExports);
+    if ((parentNamedImportOrExport == null ? void 0 : parentNamedImportOrExport.kind) === 275 /* NamedImports */) {
+      const possibleToken = stringToToken(name);
+      if (parentNamedImportOrExport && possibleToken && (possibleToken === 135 /* AwaitKeyword */ || isNonContextualKeyword(possibleToken))) {
+        insertText = `${name} as ${name}_`;
+      }
+    }
     return {
       name,
       kind: ts_SymbolDisplay_exports.getSymbolKind(typeChecker, symbol, location),
@@ -157679,7 +157699,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
   }
   function getCompletionEntryCodeActionsAndSourceDisplay(name, location, contextToken, origin, symbol, program, host, compilerOptions, sourceFile, position, previousToken, formatContext, preferences, data, source, cancellationToken) {
     if (data == null ? void 0 : data.moduleSpecifier) {
-      if (previousToken && getImportStatementCompletionInfo(contextToken || previousToken).replacementSpan) {
+      if (previousToken && getImportStatementCompletionInfo(contextToken || previousToken, sourceFile).replacementSpan) {
         return { codeActions: void 0, sourceDisplay: [textPart(data.moduleSpecifier)] };
       }
     }
@@ -157892,7 +157912,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     let isNewIdentifierLocation = false;
     let flags = 0 /* None */;
     if (contextToken) {
-      const importStatementCompletionInfo = getImportStatementCompletionInfo(contextToken);
+      const importStatementCompletionInfo = getImportStatementCompletionInfo(contextToken, sourceFile);
       if (importStatementCompletionInfo.keywordCompletion) {
         if (importStatementCompletionInfo.isKeywordOnlyCompletion) {
           return {
@@ -159523,7 +159543,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     }
     return void 0;
   }
-  function getImportStatementCompletionInfo(contextToken) {
+  function getImportStatementCompletionInfo(contextToken, sourceFile) {
     var _a, _b, _c;
     let keywordCompletion;
     let isKeywordOnlyCompletion = false;
@@ -159539,6 +159559,12 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     function getCandidate() {
       const parent2 = contextToken.parent;
       if (isImportEqualsDeclaration(parent2)) {
+        const lastToken = parent2.getLastToken(sourceFile);
+        if (isIdentifier(contextToken) && lastToken !== contextToken) {
+          keywordCompletion = 161 /* FromKeyword */;
+          isKeywordOnlyCompletion = true;
+          return void 0;
+        }
         keywordCompletion = contextToken.kind === 156 /* TypeKeyword */ ? void 0 : 156 /* TypeKeyword */;
         return isModuleSpecifierMissingOrEmpty(parent2.moduleReference) ? parent2 : void 0;
       }
@@ -160106,7 +160132,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
         extensionOptions,
         host,
         /*moduleSpecifierIsRelative*/
-        false,
+        true,
         scriptPath
       ).values());
     }

package/lib/typescript.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.2";
-      version = `${versionMajorMinor}.0-dev.20230630`;
+      version = `${versionMajorMinor}.0-dev.20230702`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -8769,6 +8769,7 @@ ${lanes.join("\n")}
         Parameter_modifiers_can_only_be_used_in_TypeScript_files: diag(8012, 1 /* Error */, "Parameter_modifiers_can_only_be_used_in_TypeScript_files_8012", "Parameter modifiers can only be used in TypeScript files."),
         Non_null_assertions_can_only_be_used_in_TypeScript_files: diag(8013, 1 /* Error */, "Non_null_assertions_can_only_be_used_in_TypeScript_files_8013", "Non-null assertions can only be used in TypeScript files."),
         Type_assertion_expressions_can_only_be_used_in_TypeScript_files: diag(8016, 1 /* Error */, "Type_assertion_expressions_can_only_be_used_in_TypeScript_files_8016", "Type assertion expressions can only be used in TypeScript files."),
+        Signature_declarations_can_only_be_used_in_TypeScript_files: diag(8017, 1 /* Error */, "Signature_declarations_can_only_be_used_in_TypeScript_files_8017", "Signature declarations can only be used in TypeScript files."),
         Report_errors_in_js_files: diag(8019, 3 /* Message */, "Report_errors_in_js_files_8019", "Report errors in .js files."),
         JSDoc_types_can_only_be_used_inside_documentation_comments: diag(8020, 1 /* Error */, "JSDoc_types_can_only_be_used_inside_documentation_comments_8020", "JSDoc types can only be used inside documentation comments."),
         JSDoc_typedef_tag_should_either_have_a_type_annotation_or_be_followed_by_property_or_member_tags: diag(8021, 1 /* Error */, "JSDoc_typedef_tag_should_either_have_a_type_annotation_or_be_followed_by_property_or_member_tags_8021", "JSDoc '@typedef' tag should either have a type annotation or be followed by '@property' or '@member' tags."),
@@ -29065,7 +29066,8 @@ ${lanes.join("\n")}
           nextToken();
           const statements = parseList(0 /* SourceElements */, parseStatement);
           Debug.assert(token() === 1 /* EndOfFileToken */);
-          const endOfFileToken = addJSDocComment(parseTokenNode());
+          const endHasJSDoc = hasPrecedingJSDocComment();
+          const endOfFileToken = withJSDoc(parseTokenNode(), endHasJSDoc);
           const sourceFile = createSourceFile2(fileName, languageVersion2, scriptKind2, isDeclarationFile, statements, endOfFileToken, sourceFlags, setExternalModuleIndicator2);
           processCommentPragmas(sourceFile, sourceText);
           processPragmasIntoFields(sourceFile, reportPragmaDiagnostic);
@@ -29085,11 +29087,11 @@ ${lanes.join("\n")}
             parseDiagnostics.push(createDetachedDiagnostic(fileName, pos, end, diagnostic));
           }
         }
-        function withJSDoc(node, hasJSDoc) {
-          return hasJSDoc ? addJSDocComment(node) : node;
-        }
         let hasDeprecatedTag = false;
-        function addJSDocComment(node) {
+        function withJSDoc(node, hasJSDoc) {
+          if (!hasJSDoc) {
+            return node;
+          }
           Debug.assert(!node.jsDoc);
           const jsDoc = mapDefined(getJSDocCommentRanges(node, sourceText), (comment) => JSDocParser.parseJSDocComment(node, comment.pos, comment.end - comment.pos));
           if (jsDoc.length)
@@ -31604,12 +31606,14 @@ ${lanes.join("\n")}
             return arrowExpression;
           }
           const pos = getNodePos();
+          const hasJSDoc = hasPrecedingJSDocComment();
           const expr = parseBinaryExpressionOrHigher(0 /* Lowest */);
           if (expr.kind === 80 /* Identifier */ && token() === 39 /* EqualsGreaterThanToken */) {
             return parseSimpleArrowFunctionExpression(
               pos,
               expr,
               allowReturnTypeInArrowFunction,
+              hasJSDoc,
               /*asyncModifier*/
               void 0
             );
@@ -31655,7 +31659,7 @@ ${lanes.join("\n")}
             ), pos);
           }
         }
-        function parseSimpleArrowFunctionExpression(pos, identifier, allowReturnTypeInArrowFunction, asyncModifier) {
+        function parseSimpleArrowFunctionExpression(pos, identifier, allowReturnTypeInArrowFunction, hasJSDoc, asyncModifier) {
           Debug.assert(token() === 39 /* EqualsGreaterThanToken */, "parseSimpleArrowFunctionExpression should only have been called if we had a =>");
           const parameter = factory2.createParameterDeclaration(
             /*modifiers*/
@@ -31688,7 +31692,7 @@ ${lanes.join("\n")}
             equalsGreaterThanToken,
             body
           );
-          return addJSDocComment(finishNode(node, pos));
+          return withJSDoc(finishNode(node, pos), hasJSDoc);
         }
         function tryParseParenthesizedArrowFunctionExpression(allowReturnTypeInArrowFunction) {
           const triState = isParenthesizedArrowFunctionExpression();
@@ -31816,9 +31820,10 @@ ${lanes.join("\n")}
           if (token() === 134 /* AsyncKeyword */) {
             if (lookAhead(isUnParenthesizedAsyncArrowFunctionWorker) === 1 /* True */) {
               const pos = getNodePos();
+              const hasJSDoc = hasPrecedingJSDocComment();
               const asyncModifier = parseModifiersForArrowFunction();
               const expr = parseBinaryExpressionOrHigher(0 /* Lowest */);
-              return parseSimpleArrowFunctionExpression(pos, expr, allowReturnTypeInArrowFunction, asyncModifier);
+              return parseSimpleArrowFunctionExpression(pos, expr, allowReturnTypeInArrowFunction, hasJSDoc, asyncModifier);
             }
           }
           return void 0;
@@ -119371,6 +119376,14 @@ ${lanes.join("\n")}
             case 265 /* TypeAliasDeclaration */:
               diagnostics.push(createDiagnosticForNode2(node, Diagnostics.Type_aliases_can_only_be_used_in_TypeScript_files));
               return "skip";
+            case 176 /* Constructor */:
+            case 174 /* MethodDeclaration */:
+            case 262 /* FunctionDeclaration */:
+              if (!node.body) {
+                diagnostics.push(createDiagnosticForNode2(node, Diagnostics.Signature_declarations_can_only_be_used_in_TypeScript_files));
+                return "skip";
+              }
+              return;
             case 266 /* EnumDeclaration */:
               const enumKeyword = Debug.checkDefined(tokenToString(94 /* EnumKeyword */));
               diagnostics.push(createDiagnosticForNode2(node, Diagnostics._0_declarations_can_only_be_used_in_TypeScript_files, enumKeyword));
@@ -156914,6 +156927,13 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       data = originToCompletionEntryData(origin);
       hasAction = !importStatementCompletion;
     }
+    const parentNamedImportOrExport = findAncestor(location, isNamedImportsOrExports);
+    if ((parentNamedImportOrExport == null ? void 0 : parentNamedImportOrExport.kind) === 275 /* NamedImports */) {
+      const possibleToken = stringToToken(name);
+      if (parentNamedImportOrExport && possibleToken && (possibleToken === 135 /* AwaitKeyword */ || isNonContextualKeyword(possibleToken))) {
+        insertText = `${name} as ${name}_`;
+      }
+    }
     return {
       name,
       kind: ts_SymbolDisplay_exports.getSymbolKind(typeChecker, symbol, location),
@@ -157694,7 +157714,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
   }
   function getCompletionEntryCodeActionsAndSourceDisplay(name, location, contextToken, origin, symbol, program, host, compilerOptions, sourceFile, position, previousToken, formatContext, preferences, data, source, cancellationToken) {
     if (data == null ? void 0 : data.moduleSpecifier) {
-      if (previousToken && getImportStatementCompletionInfo(contextToken || previousToken).replacementSpan) {
+      if (previousToken && getImportStatementCompletionInfo(contextToken || previousToken, sourceFile).replacementSpan) {
         return { codeActions: void 0, sourceDisplay: [textPart(data.moduleSpecifier)] };
       }
     }
@@ -157907,7 +157927,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     let isNewIdentifierLocation = false;
     let flags = 0 /* None */;
     if (contextToken) {
-      const importStatementCompletionInfo = getImportStatementCompletionInfo(contextToken);
+      const importStatementCompletionInfo = getImportStatementCompletionInfo(contextToken, sourceFile);
       if (importStatementCompletionInfo.keywordCompletion) {
         if (importStatementCompletionInfo.isKeywordOnlyCompletion) {
           return {
@@ -159538,7 +159558,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     }
     return void 0;
   }
-  function getImportStatementCompletionInfo(contextToken) {
+  function getImportStatementCompletionInfo(contextToken, sourceFile) {
     var _a, _b, _c;
     let keywordCompletion;
     let isKeywordOnlyCompletion = false;
@@ -159554,6 +159574,12 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     function getCandidate() {
       const parent2 = contextToken.parent;
       if (isImportEqualsDeclaration(parent2)) {
+        const lastToken = parent2.getLastToken(sourceFile);
+        if (isIdentifier(contextToken) && lastToken !== contextToken) {
+          keywordCompletion = 161 /* FromKeyword */;
+          isKeywordOnlyCompletion = true;
+          return void 0;
+        }
         keywordCompletion = contextToken.kind === 156 /* TypeKeyword */ ? void 0 : 156 /* TypeKeyword */;
         return isModuleSpecifierMissingOrEmpty(parent2.moduleReference) ? parent2 : void 0;
       }
@@ -160121,7 +160147,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
         extensionOptions,
         host,
         /*moduleSpecifierIsRelative*/
-        false,
+        true,
         scriptPath
       ).values());
     }

package/lib/typingsInstaller.js

@@ -54,7 +54,7 @@ var path = __toESM(require("path"));
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.2";
-var version = `${versionMajorMinor}.0-dev.20230630`;
+var version = `${versionMajorMinor}.0-dev.20230702`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -6839,6 +6839,7 @@ var Diagnostics = {
   Parameter_modifiers_can_only_be_used_in_TypeScript_files: diag(8012, 1 /* Error */, "Parameter_modifiers_can_only_be_used_in_TypeScript_files_8012", "Parameter modifiers can only be used in TypeScript files."),
   Non_null_assertions_can_only_be_used_in_TypeScript_files: diag(8013, 1 /* Error */, "Non_null_assertions_can_only_be_used_in_TypeScript_files_8013", "Non-null assertions can only be used in TypeScript files."),
   Type_assertion_expressions_can_only_be_used_in_TypeScript_files: diag(8016, 1 /* Error */, "Type_assertion_expressions_can_only_be_used_in_TypeScript_files_8016", "Type assertion expressions can only be used in TypeScript files."),
+  Signature_declarations_can_only_be_used_in_TypeScript_files: diag(8017, 1 /* Error */, "Signature_declarations_can_only_be_used_in_TypeScript_files_8017", "Signature declarations can only be used in TypeScript files."),
   Report_errors_in_js_files: diag(8019, 3 /* Message */, "Report_errors_in_js_files_8019", "Report errors in .js files."),
   JSDoc_types_can_only_be_used_inside_documentation_comments: diag(8020, 1 /* Error */, "JSDoc_types_can_only_be_used_inside_documentation_comments_8020", "JSDoc types can only be used inside documentation comments."),
   JSDoc_typedef_tag_should_either_have_a_type_annotation_or_be_followed_by_property_or_member_tags: diag(8021, 1 /* Error */, "JSDoc_typedef_tag_should_either_have_a_type_annotation_or_be_followed_by_property_or_member_tags_8021", "JSDoc '@typedef' tag should either have a type annotation or be followed by '@property' or '@member' tags."),
@@ -18498,7 +18499,8 @@ var Parser;
     nextToken();
     const statements = parseList(0 /* SourceElements */, parseStatement);
     Debug.assert(token() === 1 /* EndOfFileToken */);
-    const endOfFileToken = addJSDocComment(parseTokenNode());
+    const endHasJSDoc = hasPrecedingJSDocComment();
+    const endOfFileToken = withJSDoc(parseTokenNode(), endHasJSDoc);
     const sourceFile = createSourceFile2(fileName, languageVersion2, scriptKind2, isDeclarationFile, statements, endOfFileToken, sourceFlags, setExternalModuleIndicator2);
     processCommentPragmas(sourceFile, sourceText);
     processPragmasIntoFields(sourceFile, reportPragmaDiagnostic);
@@ -18518,11 +18520,11 @@ var Parser;
       parseDiagnostics.push(createDetachedDiagnostic(fileName, pos, end, diagnostic));
     }
   }
-  function withJSDoc(node, hasJSDoc) {
-    return hasJSDoc ? addJSDocComment(node) : node;
-  }
   let hasDeprecatedTag = false;
-  function addJSDocComment(node) {
+  function withJSDoc(node, hasJSDoc) {
+    if (!hasJSDoc) {
+      return node;
+    }
     Debug.assert(!node.jsDoc);
     const jsDoc = mapDefined(getJSDocCommentRanges(node, sourceText), (comment) => JSDocParser.parseJSDocComment(node, comment.pos, comment.end - comment.pos));
     if (jsDoc.length)
@@ -21037,12 +21039,14 @@ var Parser;
       return arrowExpression;
     }
     const pos = getNodePos();
+    const hasJSDoc = hasPrecedingJSDocComment();
     const expr = parseBinaryExpressionOrHigher(0 /* Lowest */);
     if (expr.kind === 80 /* Identifier */ && token() === 39 /* EqualsGreaterThanToken */) {
       return parseSimpleArrowFunctionExpression(
         pos,
         expr,
         allowReturnTypeInArrowFunction,
+        hasJSDoc,
         /*asyncModifier*/
         void 0
       );
@@ -21088,7 +21092,7 @@ var Parser;
       ), pos);
     }
   }
-  function parseSimpleArrowFunctionExpression(pos, identifier, allowReturnTypeInArrowFunction, asyncModifier) {
+  function parseSimpleArrowFunctionExpression(pos, identifier, allowReturnTypeInArrowFunction, hasJSDoc, asyncModifier) {
     Debug.assert(token() === 39 /* EqualsGreaterThanToken */, "parseSimpleArrowFunctionExpression should only have been called if we had a =>");
     const parameter = factory2.createParameterDeclaration(
       /*modifiers*/
@@ -21121,7 +21125,7 @@ var Parser;
       equalsGreaterThanToken,
       body
     );
-    return addJSDocComment(finishNode(node, pos));
+    return withJSDoc(finishNode(node, pos), hasJSDoc);
   }
   function tryParseParenthesizedArrowFunctionExpression(allowReturnTypeInArrowFunction) {
     const triState = isParenthesizedArrowFunctionExpression();
@@ -21249,9 +21253,10 @@ var Parser;
     if (token() === 134 /* AsyncKeyword */) {
       if (lookAhead(isUnParenthesizedAsyncArrowFunctionWorker) === 1 /* True */) {
         const pos = getNodePos();
+        const hasJSDoc = hasPrecedingJSDocComment();
         const asyncModifier = parseModifiersForArrowFunction();
         const expr = parseBinaryExpressionOrHigher(0 /* Lowest */);
-        return parseSimpleArrowFunctionExpression(pos, expr, allowReturnTypeInArrowFunction, asyncModifier);
+        return parseSimpleArrowFunctionExpression(pos, expr, allowReturnTypeInArrowFunction, hasJSDoc, asyncModifier);
       }
     }
     return void 0;

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "5.2.0-dev.20230630",
+    "version": "5.2.0-dev.20230702",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [
@@ -114,5 +114,5 @@
         "node": "20.1.0",
         "npm": "8.19.4"
     },
-    "gitHead": "4d7738ca217aca36e6150c25fbefcb5d5d4eae5c"
+    "gitHead": "88cb76d314a93937ce8d9543114ccbad993be6d1"
 }