@typescript-deploys/pr-build 5.2.0-pr-55267-2 → 5.2.0-pr-55267-8

package/lib/tsserver.js

@@ -138396,7 +138396,7 @@ registerRefactor(refactorNameForMoveToFile, {
       if (host.fileExists(targetFile) && program.getSourceFile(targetFile) === void 0) {
         return error(getLocaleSpecificMessage(Diagnostics.Cannot_move_statements_to_the_selected_file));
       }
-      const edits = ts_textChanges_exports.ChangeTracker.with(context, (t) => doChange4(context, context.file, interactiveRefactorArguments.targetFile, program, statements, t, context.host, context.preferences));
+      const edits = ts_textChanges_exports.ChangeTracker.with(context, (t) => doChange4(context, context.file, interactiveRefactorArguments.targetFile, context.program, statements, t, context.host, context.preferences));
       return { edits, renameFilename: void 0, renameLocation: void 0 };
     }
     return error(getLocaleSpecificMessage(Diagnostics.Cannot_move_to_file_selected_file_is_invalid));
@@ -139032,25 +139032,25 @@ function getRangeToMove(context) {
   const { file } = context;
   const range = createTextRangeFromSpan(getRefactorContextSpan(context));
   const { statements } = file;
-  const startNodeIndex = findIndex(statements, (s) => s.end > range.pos);
+  let startNodeIndex = findIndex(statements, (s) => s.end > range.pos);
   if (startNodeIndex === -1)
     return void 0;
   const startStatement = statements[startNodeIndex];
-  if (isNamedDeclaration(startStatement) && startStatement.name && rangeContainsRange(startStatement.name, range)) {
-    return { toMove: [statements[startNodeIndex]], afterLast: statements[startNodeIndex + 1] };
-  }
   const overloadRangeToMove = getOverloadRangeToMove(file, startStatement);
   if (overloadRangeToMove) {
-    return overloadRangeToMove;
+    startNodeIndex = overloadRangeToMove.start;
+  }
+  let endNodeIndex = findIndex(statements, (s) => s.end >= range.end, startNodeIndex);
+  if (endNodeIndex !== -1 && range.end <= statements[endNodeIndex].getStart()) {
+    endNodeIndex--;
+  }
+  const endingOverloadRangeToMove = getOverloadRangeToMove(file, statements[endNodeIndex]);
+  if (endingOverloadRangeToMove) {
+    endNodeIndex = endingOverloadRangeToMove.end;
   }
-  if (range.pos > startStatement.getStart(file))
-    return void 0;
-  const afterEndNodeIndex = findIndex(statements, (s) => s.end > range.end, startNodeIndex);
-  if (afterEndNodeIndex !== -1 && (afterEndNodeIndex === 0 || statements[afterEndNodeIndex].getStart(file) < range.end))
-    return void 0;
   return {
-    toMove: statements.slice(startNodeIndex, afterEndNodeIndex === -1 ? statements.length : afterEndNodeIndex),
-    afterLast: afterEndNodeIndex === -1 ? void 0 : statements[afterEndNodeIndex]
+    toMove: statements.slice(startNodeIndex, endNodeIndex === -1 ? statements.length : endNodeIndex + 1),
+    afterLast: endNodeIndex === -1 ? void 0 : statements[endNodeIndex + 1]
   };
 }
 function getStatementsToMove(context) {
@@ -139305,10 +139305,12 @@ function getOverloadRangeToMove(sourceFile, statement) {
     if (declarations === void 0 || length(declarations) <= 1 || !contains(declarations, statement)) {
       return void 0;
     }
+    const firstDecl = declarations[0];
     const lastDecl = declarations[length(declarations) - 1];
     const statementsToMove = mapDefined(declarations, (d) => getSourceFileOfNode(d) === sourceFile && isStatement(d) ? d : void 0);
-    const end = findLastIndex(sourceFile.statements, (s) => s.end > lastDecl.end);
-    return { toMove: statementsToMove, afterLast: end >= 0 ? sourceFile.statements[end] : void 0 };
+    const end = findIndex(sourceFile.statements, (s) => s.end >= lastDecl.end);
+    const start2 = findIndex(sourceFile.statements, (s) => s.end >= firstDecl.end);
+    return { toMove: statementsToMove, start: start2, end };
   }
   return void 0;
 }

package/lib/tsserverlibrary.js

@@ -137403,25 +137403,25 @@ ${lanes.join("\n")}
     const { file } = context;
     const range = createTextRangeFromSpan(getRefactorContextSpan(context));
     const { statements } = file;
-    const startNodeIndex = findIndex(statements, (s) => s.end > range.pos);
+    let startNodeIndex = findIndex(statements, (s) => s.end > range.pos);
     if (startNodeIndex === -1)
       return void 0;
     const startStatement = statements[startNodeIndex];
-    if (isNamedDeclaration(startStatement) && startStatement.name && rangeContainsRange(startStatement.name, range)) {
-      return { toMove: [statements[startNodeIndex]], afterLast: statements[startNodeIndex + 1] };
-    }
     const overloadRangeToMove = getOverloadRangeToMove(file, startStatement);
     if (overloadRangeToMove) {
-      return overloadRangeToMove;
+      startNodeIndex = overloadRangeToMove.start;
+    }
+    let endNodeIndex = findIndex(statements, (s) => s.end >= range.end, startNodeIndex);
+    if (endNodeIndex !== -1 && range.end <= statements[endNodeIndex].getStart()) {
+      endNodeIndex--;
+    }
+    const endingOverloadRangeToMove = getOverloadRangeToMove(file, statements[endNodeIndex]);
+    if (endingOverloadRangeToMove) {
+      endNodeIndex = endingOverloadRangeToMove.end;
     }
-    if (range.pos > startStatement.getStart(file))
-      return void 0;
-    const afterEndNodeIndex = findIndex(statements, (s) => s.end > range.end, startNodeIndex);
-    if (afterEndNodeIndex !== -1 && (afterEndNodeIndex === 0 || statements[afterEndNodeIndex].getStart(file) < range.end))
-      return void 0;
     return {
-      toMove: statements.slice(startNodeIndex, afterEndNodeIndex === -1 ? statements.length : afterEndNodeIndex),
-      afterLast: afterEndNodeIndex === -1 ? void 0 : statements[afterEndNodeIndex]
+      toMove: statements.slice(startNodeIndex, endNodeIndex === -1 ? statements.length : endNodeIndex + 1),
+      afterLast: endNodeIndex === -1 ? void 0 : statements[endNodeIndex + 1]
     };
   }
   function getStatementsToMove(context) {
@@ -137676,10 +137676,12 @@ ${lanes.join("\n")}
       if (declarations === void 0 || length(declarations) <= 1 || !contains(declarations, statement)) {
         return void 0;
       }
+      const firstDecl = declarations[0];
       const lastDecl = declarations[length(declarations) - 1];
       const statementsToMove = mapDefined(declarations, (d) => getSourceFileOfNode(d) === sourceFile && isStatement(d) ? d : void 0);
-      const end = findLastIndex(sourceFile.statements, (s) => s.end > lastDecl.end);
-      return { toMove: statementsToMove, afterLast: end >= 0 ? sourceFile.statements[end] : void 0 };
+      const end = findIndex(sourceFile.statements, (s) => s.end >= lastDecl.end);
+      const start = findIndex(sourceFile.statements, (s) => s.end >= firstDecl.end);
+      return { toMove: statementsToMove, start, end };
     }
     return void 0;
   }
@@ -137726,7 +137728,7 @@ ${lanes.join("\n")}
             if (host.fileExists(targetFile) && program.getSourceFile(targetFile) === void 0) {
               return error(getLocaleSpecificMessage(Diagnostics.Cannot_move_statements_to_the_selected_file));
             }
-            const edits = ts_textChanges_exports.ChangeTracker.with(context, (t) => doChange4(context, context.file, interactiveRefactorArguments.targetFile, program, statements, t, context.host, context.preferences));
+            const edits = ts_textChanges_exports.ChangeTracker.with(context, (t) => doChange4(context, context.file, interactiveRefactorArguments.targetFile, context.program, statements, t, context.host, context.preferences));
             return { edits, renameFilename: void 0, renameLocation: void 0 };
           }
           return error(getLocaleSpecificMessage(Diagnostics.Cannot_move_to_file_selected_file_is_invalid));

package/lib/typescript.js

@@ -137418,25 +137418,25 @@ ${lanes.join("\n")}
     const { file } = context;
     const range = createTextRangeFromSpan(getRefactorContextSpan(context));
     const { statements } = file;
-    const startNodeIndex = findIndex(statements, (s) => s.end > range.pos);
+    let startNodeIndex = findIndex(statements, (s) => s.end > range.pos);
     if (startNodeIndex === -1)
       return void 0;
     const startStatement = statements[startNodeIndex];
-    if (isNamedDeclaration(startStatement) && startStatement.name && rangeContainsRange(startStatement.name, range)) {
-      return { toMove: [statements[startNodeIndex]], afterLast: statements[startNodeIndex + 1] };
-    }
     const overloadRangeToMove = getOverloadRangeToMove(file, startStatement);
     if (overloadRangeToMove) {
-      return overloadRangeToMove;
+      startNodeIndex = overloadRangeToMove.start;
+    }
+    let endNodeIndex = findIndex(statements, (s) => s.end >= range.end, startNodeIndex);
+    if (endNodeIndex !== -1 && range.end <= statements[endNodeIndex].getStart()) {
+      endNodeIndex--;
+    }
+    const endingOverloadRangeToMove = getOverloadRangeToMove(file, statements[endNodeIndex]);
+    if (endingOverloadRangeToMove) {
+      endNodeIndex = endingOverloadRangeToMove.end;
     }
-    if (range.pos > startStatement.getStart(file))
-      return void 0;
-    const afterEndNodeIndex = findIndex(statements, (s) => s.end > range.end, startNodeIndex);
-    if (afterEndNodeIndex !== -1 && (afterEndNodeIndex === 0 || statements[afterEndNodeIndex].getStart(file) < range.end))
-      return void 0;
     return {
-      toMove: statements.slice(startNodeIndex, afterEndNodeIndex === -1 ? statements.length : afterEndNodeIndex),
-      afterLast: afterEndNodeIndex === -1 ? void 0 : statements[afterEndNodeIndex]
+      toMove: statements.slice(startNodeIndex, endNodeIndex === -1 ? statements.length : endNodeIndex + 1),
+      afterLast: endNodeIndex === -1 ? void 0 : statements[endNodeIndex + 1]
     };
   }
   function getStatementsToMove(context) {
@@ -137691,10 +137691,12 @@ ${lanes.join("\n")}
       if (declarations === void 0 || length(declarations) <= 1 || !contains(declarations, statement)) {
         return void 0;
       }
+      const firstDecl = declarations[0];
       const lastDecl = declarations[length(declarations) - 1];
       const statementsToMove = mapDefined(declarations, (d) => getSourceFileOfNode(d) === sourceFile && isStatement(d) ? d : void 0);
-      const end = findLastIndex(sourceFile.statements, (s) => s.end > lastDecl.end);
-      return { toMove: statementsToMove, afterLast: end >= 0 ? sourceFile.statements[end] : void 0 };
+      const end = findIndex(sourceFile.statements, (s) => s.end >= lastDecl.end);
+      const start = findIndex(sourceFile.statements, (s) => s.end >= firstDecl.end);
+      return { toMove: statementsToMove, start, end };
     }
     return void 0;
   }
@@ -137741,7 +137743,7 @@ ${lanes.join("\n")}
             if (host.fileExists(targetFile) && program.getSourceFile(targetFile) === void 0) {
               return error(getLocaleSpecificMessage(Diagnostics.Cannot_move_statements_to_the_selected_file));
             }
-            const edits = ts_textChanges_exports.ChangeTracker.with(context, (t) => doChange4(context, context.file, interactiveRefactorArguments.targetFile, program, statements, t, context.host, context.preferences));
+            const edits = ts_textChanges_exports.ChangeTracker.with(context, (t) => doChange4(context, context.file, interactiveRefactorArguments.targetFile, context.program, statements, t, context.host, context.preferences));
             return { edits, renameFilename: void 0, renameLocation: void 0 };
           }
           return error(getLocaleSpecificMessage(Diagnostics.Cannot_move_to_file_selected_file_is_invalid));

package/package.json

@@ -2,7 +2,7 @@
   "name": "@typescript-deploys/pr-build",
   "author": "Microsoft Corp.",
   "homepage": "https://www.typescriptlang.org/",
-  "version": "5.2.0-pr-55267-2",
+  "version": "5.2.0-pr-55267-8",
   "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": "288736dde18d1be30115fe9996c222aa98eaf2ac"
+  "gitHead": "352ff28197f0785e1fc1664f402e9bb1e2d350c8"
 }