typescript 5.2.0-dev.20230807 → 5.2.2

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.20230807`;
+var version = "5.2.2";
 
 // src/compiler/core.ts
 var emptyArray = [];

package/lib/tsserver.js

@@ -2331,7 +2331,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.2";
-var version = `${versionMajorMinor}.0-dev.20230807`;
+var version = "5.2.2";
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -164760,11 +164760,11 @@ function provideInlayHints(context) {
   function isSignatureSupportingReturnAnnotation(node) {
     return isArrowFunction(node) || isFunctionExpression(node) || isFunctionDeclaration(node) || isMethodDeclaration(node) || isGetAccessorDeclaration(node);
   }
-  function addParameterHints(text, parameter, position, isFirstVariadicArgument, sourceFile) {
+  function addParameterHints(text, parameter, position, isFirstVariadicArgument) {
     let hintText = `${isFirstVariadicArgument ? "..." : ""}${text}`;
     let displayParts;
     if (shouldUseInteractiveInlayHints(preferences)) {
-      displayParts = [getNodeDisplayPart(hintText, parameter, sourceFile), { text: ":" }];
+      displayParts = [getNodeDisplayPart(hintText, parameter), { text: ":" }];
       hintText = "";
     } else {
       hintText += ":";
@@ -164837,7 +164837,6 @@ function provideInlayHints(context) {
       return;
     }
     let signatureParamPos = 0;
-    const sourceFile = shouldUseInteractiveInlayHints(preferences) ? expr.getSourceFile() : void 0;
     for (const originalArg of args) {
       const arg = skipParentheses(originalArg);
       if (shouldShowLiteralParameterNameHintsOnly(preferences) && !isHintableLiteral(arg)) {
@@ -164870,7 +164869,7 @@ function provideInlayHints(context) {
         if (leadingCommentsContainsParameterName(arg, name)) {
           continue;
         }
-        addParameterHints(name, parameter, originalArg.getStart(), isFirstVariadicArgument, sourceFile);
+        addParameterHints(name, parameter, originalArg.getStart(), isFirstVariadicArgument);
       }
     }
   }
@@ -165006,7 +165005,8 @@ function provideInlayHints(context) {
     }
     return true;
   }
-  function getNodeDisplayPart(text, node, sourceFile) {
+  function getNodeDisplayPart(text, node) {
+    const sourceFile = node.getSourceFile();
     return {
       text,
       span: createTextSpanFromNode(node, sourceFile),
@@ -183666,14 +183666,22 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
       return {
         ...hint,
         position: scriptInfo.positionToLineOffset(position),
-        displayParts: displayParts == null ? void 0 : displayParts.map(({ text, span, file: file2 }) => ({
-          text,
-          span: span && {
-            start: scriptInfo.positionToLineOffset(span.start),
-            end: scriptInfo.positionToLineOffset(span.start + span.length),
-            file: file2
+        displayParts: displayParts == null ? void 0 : displayParts.map(({ text, span, file: file2 }) => {
+          if (span) {
+            Debug.assertIsDefined(file2, "Target file should be defined together with its span.");
+            const scriptInfo2 = this.projectService.getScriptInfo(file2);
+            return {
+              text,
+              span: {
+                start: scriptInfo2.positionToLineOffset(span.start),
+                end: scriptInfo2.positionToLineOffset(span.start + span.length),
+                file: file2
+              }
+            };
+          } else {
+            return { text };
           }
-        }))
+        })
       };
     });
   }

package/lib/tsserverlibrary.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.2";
-      version = `${versionMajorMinor}.0-dev.20230807`;
+      version = "5.2.2";
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -164108,11 +164108,11 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     function isSignatureSupportingReturnAnnotation(node) {
       return isArrowFunction(node) || isFunctionExpression(node) || isFunctionDeclaration(node) || isMethodDeclaration(node) || isGetAccessorDeclaration(node);
     }
-    function addParameterHints(text, parameter, position, isFirstVariadicArgument, sourceFile) {
+    function addParameterHints(text, parameter, position, isFirstVariadicArgument) {
       let hintText = `${isFirstVariadicArgument ? "..." : ""}${text}`;
       let displayParts;
       if (shouldUseInteractiveInlayHints(preferences)) {
-        displayParts = [getNodeDisplayPart(hintText, parameter, sourceFile), { text: ":" }];
+        displayParts = [getNodeDisplayPart(hintText, parameter), { text: ":" }];
         hintText = "";
       } else {
         hintText += ":";
@@ -164185,7 +164185,6 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
         return;
       }
       let signatureParamPos = 0;
-      const sourceFile = shouldUseInteractiveInlayHints(preferences) ? expr.getSourceFile() : void 0;
       for (const originalArg of args) {
         const arg = skipParentheses(originalArg);
         if (shouldShowLiteralParameterNameHintsOnly(preferences) && !isHintableLiteral(arg)) {
@@ -164218,7 +164217,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
           if (leadingCommentsContainsParameterName(arg, name)) {
             continue;
           }
-          addParameterHints(name, parameter, originalArg.getStart(), isFirstVariadicArgument, sourceFile);
+          addParameterHints(name, parameter, originalArg.getStart(), isFirstVariadicArgument);
         }
       }
     }
@@ -164354,7 +164353,8 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       }
       return true;
     }
-    function getNodeDisplayPart(text, node, sourceFile) {
+    function getNodeDisplayPart(text, node) {
+      const sourceFile = node.getSourceFile();
       return {
         text,
         span: createTextSpanFromNode(node, sourceFile),
@@ -181073,14 +181073,22 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
             return {
               ...hint,
               position: scriptInfo.positionToLineOffset(position),
-              displayParts: displayParts == null ? void 0 : displayParts.map(({ text, span, file: file2 }) => ({
-                text,
-                span: span && {
-                  start: scriptInfo.positionToLineOffset(span.start),
-                  end: scriptInfo.positionToLineOffset(span.start + span.length),
-                  file: file2
+              displayParts: displayParts == null ? void 0 : displayParts.map(({ text, span, file: file2 }) => {
+                if (span) {
+                  Debug.assertIsDefined(file2, "Target file should be defined together with its span.");
+                  const scriptInfo2 = this.projectService.getScriptInfo(file2);
+                  return {
+                    text,
+                    span: {
+                      start: scriptInfo2.positionToLineOffset(span.start),
+                      end: scriptInfo2.positionToLineOffset(span.start + span.length),
+                      file: file2
+                    }
+                  };
+                } else {
+                  return { text };
                 }
-              }))
+              })
             };
           });
         }

package/lib/typescript.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.2";
-      version = `${versionMajorMinor}.0-dev.20230807`;
+      version = "5.2.2";
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -164123,11 +164123,11 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     function isSignatureSupportingReturnAnnotation(node) {
       return isArrowFunction(node) || isFunctionExpression(node) || isFunctionDeclaration(node) || isMethodDeclaration(node) || isGetAccessorDeclaration(node);
     }
-    function addParameterHints(text, parameter, position, isFirstVariadicArgument, sourceFile) {
+    function addParameterHints(text, parameter, position, isFirstVariadicArgument) {
       let hintText = `${isFirstVariadicArgument ? "..." : ""}${text}`;
       let displayParts;
       if (shouldUseInteractiveInlayHints(preferences)) {
-        displayParts = [getNodeDisplayPart(hintText, parameter, sourceFile), { text: ":" }];
+        displayParts = [getNodeDisplayPart(hintText, parameter), { text: ":" }];
         hintText = "";
       } else {
         hintText += ":";
@@ -164200,7 +164200,6 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
         return;
       }
       let signatureParamPos = 0;
-      const sourceFile = shouldUseInteractiveInlayHints(preferences) ? expr.getSourceFile() : void 0;
       for (const originalArg of args) {
         const arg = skipParentheses(originalArg);
         if (shouldShowLiteralParameterNameHintsOnly(preferences) && !isHintableLiteral(arg)) {
@@ -164233,7 +164232,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
           if (leadingCommentsContainsParameterName(arg, name)) {
             continue;
           }
-          addParameterHints(name, parameter, originalArg.getStart(), isFirstVariadicArgument, sourceFile);
+          addParameterHints(name, parameter, originalArg.getStart(), isFirstVariadicArgument);
         }
       }
     }
@@ -164369,7 +164368,8 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       }
       return true;
     }
-    function getNodeDisplayPart(text, node, sourceFile) {
+    function getNodeDisplayPart(text, node) {
+      const sourceFile = node.getSourceFile();
       return {
         text,
         span: createTextSpanFromNode(node, sourceFile),

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.20230807`;
+var version = "5.2.2";
 
 // src/compiler/core.ts
 var emptyArray = [];

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "5.2.0-dev.20230807",
+    "version": "5.2.2",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [
@@ -112,6 +112,5 @@
     "volta": {
         "node": "20.1.0",
         "npm": "8.19.4"
-    },
-    "gitHead": "e936eb13d2900f21d79553c32a704307c7ad03dd"
-}
+    }
+}