@zzzen/pyright-internal 1.2.0-dev.20230219 → 1.2.0-dev.20230305

package/dist/tests/importAdder.test.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const assert_1 = __importDefault(require("assert"));
 const vscode_languageserver_1 = require("vscode-languageserver");
-const textEditUtils_1 = require("../common/textEditUtils");
+const textEditTracker_1 = require("../common/textEditTracker");
 const textRange_1 = require("../common/textRange");
 const importAdder_1 = require("../languageService/importAdder");
 const testState_1 = require("./harness/fourslash/testState");
@@ -1201,13 +1201,26 @@ test('use relative import format - textEditTracker', () => {
         `;
     testImportMoveWithTracker(code, "relative" /* Relative */);
 });
+test('dont include token not contained in the span', () => {
+    const code = `
+// @filename: test1.py
+//// import random
+//// 
+//// [|/*src*/answer_word = random.choice(["a","b","c","d"])
+//// |]guess_word = "c"
+
+// @filename: nested/__init__.py
+//// [|{|"r":"import random!n!!n!!n!"|}|][|/*dest*/|]
+        `;
+    testImportMove(code, "absolute" /* Absolute */);
+});
 function testImportMoveWithTracker(code, importFormat = "absolute" /* Absolute */) {
     const state = (0, testState_1.parseAndGetTestState)(code).state;
     const src = state.getRangeByMarkerName('src');
     const dest = state.getMarkerByName('dest');
     const importMover = new importAdder_1.ImportAdder(state.configOptions, state.importResolver, state.program.evaluator);
     const importData = importMover.collectImportsForSymbolsUsed(state.program.getBoundSourceFile(src.fileName).getParseResults(), textRange_1.TextRange.fromBounds(src.pos, src.end), vscode_languageserver_1.CancellationToken.None);
-    const tracker = new textEditUtils_1.TextEditTracker();
+    const tracker = new textEditTracker_1.TextEditTracker();
     importMover.applyImportsTo(importData, state.program.getBoundSourceFile(dest.fileName).getParseResults(), importFormat, tracker, vscode_languageserver_1.CancellationToken.None);
     verifyEdits(tracker.getEdits(vscode_languageserver_1.CancellationToken.None), state);
 }
@@ -1217,7 +1230,7 @@ function testImportMove(code, importFormat = "absolute" /* Absolute */) {
     const dest = state.getMarkerByName('dest');
     const importMover = new importAdder_1.ImportAdder(state.configOptions, state.importResolver, state.program.evaluator);
     const importData = importMover.collectImportsForSymbolsUsed(state.program.getBoundSourceFile(src.fileName).getParseResults(), textRange_1.TextRange.fromBounds(src.pos, src.end), vscode_languageserver_1.CancellationToken.None);
-    const edits = importMover.applyImports(importData, state.program.getBoundSourceFile(dest.fileName).getParseResults(), dest.position, importFormat, vscode_languageserver_1.CancellationToken.None);
+    const edits = importMover.applyImports(importData, dest.fileName, state.program.getBoundSourceFile(dest.fileName).getParseResults(), dest.position, importFormat, vscode_languageserver_1.CancellationToken.None);
     verifyEdits(edits, state);
 }
 function verifyEdits(edits, state) {

package/dist/tests/importAdder.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"importAdder.test.js","sourceRoot":"","sources":["../../../src/tests/importAdder.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"importAdder.test.js","sourceRoot":"","sources":["../../../src/tests/importAdder.test.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;AAEH,oDAA4B;AAC5B,iEAA0D;AAG1D,+DAA4D;AAC5D,mDAAgE;AAEhE,gEAA6D;AAC7D,6DAAgF;AAChF,qDAA+F;AAE/F,IAAI,CAAC,eAAe,EAAE,GAAG,EAAE;IACvB,MAAM,IAAI,GAAG;;;;;;;;;SASR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,iBAAiB,EAAE,GAAG,EAAE;IACzB,MAAM,IAAI,GAAG;;;;;;;;;;;SAWR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,0BAA0B,EAAE,GAAG,EAAE;IAClC,MAAM,IAAI,GAAG;;;;;;SAMR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,eAAe,EAAE,GAAG,EAAE;IACvB,MAAM,IAAI,GAAG;;;;;;;SAOR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,yBAAyB,EAAE,GAAG,EAAE;IACjC,MAAM,IAAI,GAAG;;;;;;;;;SASR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,wBAAwB,EAAE,GAAG,EAAE;IAChC,MAAM,IAAI,GAAG;;;;;;;;;;SAUR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,2BAA2B,EAAE,GAAG,EAAE;IACnC,MAAM,IAAI,GAAG;;;;;;;SAOR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,uBAAuB,EAAE,GAAG,EAAE;IAC/B,MAAM,IAAI,GAAG;;;;;;;SAOR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,0BAA0B,EAAE,GAAG,EAAE;IAClC,MAAM,IAAI,GAAG;;;;;;;SAOR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,eAAe,EAAE,GAAG,EAAE;IACvB,MAAM,IAAI,GAAG;;;;;;;SAOR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,yBAAyB,EAAE,GAAG,EAAE;IACjC,MAAM,IAAI,GAAG;;;;;;;;;SASR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,uBAAuB,EAAE,GAAG,EAAE;IAC/B,MAAM,IAAI,GAAG;;;;;;;;SAQR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,uBAAuB,EAAE,GAAG,EAAE;IAC/B,MAAM,IAAI,GAAG;;;;;;;SAOR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,uBAAuB,EAAE,GAAG,EAAE;IAC/B,MAAM,IAAI,GAAG;;;;;;SAMR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,YAAY,EAAE,GAAG,EAAE;IACpB,MAAM,IAAI,GAAG;;;;;;;SAOR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,uBAAuB,EAAE,GAAG,EAAE;IAC/B,MAAM,IAAI,GAAG;;;;;;;;;SASR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,iCAAiC,EAAE,GAAG,EAAE;IACzC,MAAM,IAAI,GAAG;;;;;;;;;SASR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,iCAAiC,EAAE,GAAG,EAAE;IACzC,MAAM,IAAI,GAAG;;;;;;;;;SASR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,uBAAuB,EAAE,GAAG,EAAE;IAC/B,MAAM,IAAI,GAAG;;;;;;;;;;SAUR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,8BAA8B,EAAE,GAAG,EAAE;IACtC,MAAM,IAAI,GAAG;;;;;;;;SAQR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,uBAAuB,EAAE,GAAG,EAAE;IAC/B,MAAM,IAAI,GAAG;;;;;;;;;;SAUR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,8BAA8B,EAAE,GAAG,EAAE;IACtC,MAAM,IAAI,GAAG;;;;;;;;SAQR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,iCAAiC,EAAE,GAAG,EAAE;IACzC,MAAM,IAAI,GAAG;;;;;;;;SAQR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAC5B,MAAM,IAAI,GAAG;;;;;;;;SAQR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,8BAA8B,EAAE,GAAG,EAAE;IACtC,MAAM,IAAI,GAAG;;;;;;;;;SASR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,kCAAkC,EAAE,GAAG,EAAE;IAC1C,MAAM,IAAI,GAAG;;;;;;;;;SASR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,8BAA8B,EAAE,GAAG,EAAE;IACtC,MAAM,IAAI,GAAG;;;;;;;;;SASR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,kCAAkC,EAAE,GAAG,EAAE;IAC1C,MAAM,IAAI,GAAG;;;;;;;;;SASR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,+CAA+C,EAAE,GAAG,EAAE;IACvD,MAAM,IAAI,GAAG;;;;;;;;;;;SAWR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,0DAA0D,EAAE,GAAG,EAAE;IAClE,MAAM,IAAI,GAAG;;;;;;;;;;;SAWR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,iCAAiC,EAAE,GAAG,EAAE;IACzC,MAAM,IAAI,GAAG;;;;;;;;;;;SAWR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,4CAA4C,EAAE,GAAG,EAAE;IACpD,MAAM,IAAI,GAAG;;;;;;;;;;;SAWR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,0CAA0C,EAAE,GAAG,EAAE;IAClD,MAAM,IAAI,GAAG;;;;;;;;;;;;SAYR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,uDAAuD,EAAE,GAAG,EAAE;IAC/D,MAAM,IAAI,GAAG;;;;;;;;;;;;SAYR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,qDAAqD,EAAE,GAAG,EAAE;IAC7D,MAAM,IAAI,GAAG;;;;;;;;;;;;;;;;;;;;;;SAsBR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,mCAAmC,EAAE,GAAG,EAAE;IAC3C,MAAM,IAAI,GAAG;;;;;;;;;SASR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,uCAAuC,EAAE,GAAG,EAAE;IAC/C,MAAM,IAAI,GAAG;;;;;;;;;SASR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,sCAAsC,EAAE,GAAG,EAAE;IAC9C,MAAM,IAAI,GAAG;;;;;;;;;SASR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,iDAAiD,EAAE,GAAG,EAAE;IACzD,MAAM,IAAI,GAAG;;;;;;;;;SASR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,mCAAmC,EAAE,GAAG,EAAE;IAC3C,MAAM,IAAI,GAAG;;;;;;;;;SASR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,8CAA8C,EAAE,GAAG,EAAE;IACtD,MAAM,IAAI,GAAG;;;;;;;;;SASR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,oDAAoD,EAAE,GAAG,EAAE;IAC5D,MAAM,IAAI,GAAG;;;;;;;;;;;SAWR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,+DAA+D,EAAE,GAAG,EAAE;IACvE,MAAM,IAAI,GAAG;;;;;;;;;;;SAWR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,sCAAsC,EAAE,GAAG,EAAE;IAC9C,MAAM,IAAI,GAAG;;;;;;;;;;;SAWR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,iDAAiD,EAAE,GAAG,EAAE;IACzD,MAAM,IAAI,GAAG;;;;;;;;;;;SAWR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,+CAA+C,EAAE,GAAG,EAAE;IACvD,MAAM,IAAI,GAAG;;;;;;;;;;;;SAYR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,4DAA4D,EAAE,GAAG,EAAE;IACpE,MAAM,IAAI,GAAG;;;;;;;;;;;;SAYR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,0DAA0D,EAAE,GAAG,EAAE;IAClE,MAAM,IAAI,GAAG;;;;;;;;;;;;;;;;;;;;;;SAsBR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,2BAA2B,EAAE,GAAG,EAAE;IACnC,MAAM,IAAI,GAAG;;;;;;;;;;;;;;;;;;;;SAoBR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,+BAA+B,EAAE,GAAG,EAAE;IACvC,MAAM,IAAI,GAAG;;;;;;;;;;;SAWR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,8CAA8C,EAAE,GAAG,EAAE;IACtD,MAAM,IAAI,GAAG;;;;;;;;;;;SAWR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,2DAA2D,EAAE,GAAG,EAAE;IACnE,MAAM,IAAI,GAAG;;;;;;;;;;;SAWR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,0DAA0D,EAAE,GAAG,EAAE;IAClE,MAAM,IAAI,GAAG;;;;;;;;;;;SAWR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,4DAA4D,EAAE,GAAG,EAAE;IACpE,MAAM,IAAI,GAAG;;;;;;;;;;;SAWR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,kDAAkD,EAAE,GAAG,EAAE;IAC1D,MAAM,IAAI,GAAG;;;;;;;;;;;SAWR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,0BAA0B,EAAE,GAAG,EAAE;IAClC,MAAM,IAAI,GAAG;;;;;;;;;;;SAWR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,kBAAkB,EAAE,GAAG,EAAE;IAC1B,MAAM,IAAI,GAAG;;;;;;;;;;;SAWR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,iCAAiC,EAAE,GAAG,EAAE;IACzC,MAAM,IAAI,GAAG;;;;;;;;;;;SAWR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,wBAAwB,EAAE,GAAG,EAAE;IAChC,MAAM,IAAI,GAAG;;;;;;;;;;;;SAYR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,sCAAsC,EAAE,GAAG,EAAE;IAC9C,MAAM,IAAI,GAAG;;;;;;;;;;;;SAYR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,4BAA4B,EAAE,GAAG,EAAE;IACpC,MAAM,IAAI,GAAG;;;;;;;;SAQR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,6CAA6C,EAAE,GAAG,EAAE;IACrD,MAAM,IAAI,GAAG;;;;;;;;;;SAUR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,0CAA0C,EAAE,GAAG,EAAE;IAClD,MAAM,IAAI,GAAG;;;;;;;;SAQR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,mEAAmE,EAAE,GAAG,EAAE;IAC3E,MAAM,IAAI,GAAG;;;;;;;;;;;SAWR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,sDAAsD,EAAE,GAAG,EAAE;IAC9D,MAAM,IAAI,GAAG;;;;;;;;;;;SAWR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,iEAAiE,EAAE,GAAG,EAAE;IACzE,MAAM,IAAI,GAAG;;;;;;;;;;;SAWR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,qCAAqC,EAAE,GAAG,EAAE;IAC7C,MAAM,IAAI,GAAG;;;;;;;;;;;;;SAaR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,gDAAgD,EAAE,GAAG,EAAE;IACxD,MAAM,IAAI,GAAG;;;;;;;;;;;;;SAaR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,iDAAiD,EAAE,GAAG,EAAE;IACzD,MAAM,IAAI,GAAG;;;;;;;;;;;;;SAaR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,mDAAmD,EAAE,GAAG,EAAE;IAC3D,MAAM,IAAI,GAAG;;;;;;;;;;;;;SAaR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,qDAAqD,EAAE,GAAG,EAAE;IAC7D,MAAM,IAAI,GAAG;;;;;;;;;;;;;SAaR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,uDAAuD,EAAE,GAAG,EAAE;IAC/D,MAAM,IAAI,GAAG;;;;;;;;;;;;;SAaR,CAAC;IAEN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,kCAAkC,EAAE,GAAG,EAAE;IAC1C,MAAM,IAAI,GAAG;;;;;;;;;;;;;;;;SAgBR,CAAC;IACN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,6CAA6C,EAAE,GAAG,EAAE;IACrD,MAAM,IAAI,GAAG;;;;;;;;;;;;;;;;SAgBR,CAAC;IACN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,0CAA0C,EAAE,GAAG,EAAE;IAClD,MAAM,IAAI,GAAG;;;;;;;;;SASR,CAAC;IACN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,+CAA+C,EAAE,GAAG,EAAE;IACvD,MAAM,IAAI,GAAG;;;;;;;;;SASR,CAAC;IACN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,0DAA0D,EAAE,GAAG,EAAE;IAClE,MAAM,IAAI,GAAG;;;;;;;;;SASR,CAAC;IACN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,4DAA4D,EAAE,GAAG,EAAE;IACpE,MAAM,IAAI,GAAG;;;;;;;;;SASR,CAAC;IACN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,uEAAuE,EAAE,GAAG,EAAE;IAC/E,MAAM,IAAI,GAAG;;;;;;;;;SASR,CAAC;IACN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,6DAA6D,EAAE,GAAG,EAAE;IACrE,MAAM,IAAI,GAAG;;;;;;;;;;;SAWR,CAAC;IACN,cAAc,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,4BAA4B,EAAE,GAAG,EAAE;IACpC,MAAM,IAAI,GAAG;;;;;;;;;;;SAWR,CAAC;IACN,cAAc,CAAC,IAAI,4BAAwB,CAAC;AAChD,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,8CAA8C,EAAE,GAAG,EAAE;IACtD,MAAM,IAAI,GAAG;;;;;;;;;;;SAWR,CAAC;IACN,yBAAyB,CAAC,IAAI,4BAAwB,CAAC;AAC3D,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,8CAA8C,EAAE,GAAG,EAAE;IACtD,MAAM,IAAI,GAAG;;;;;;;;;SASR,CAAC;IACN,cAAc,CAAC,IAAI,4BAAwB,CAAC;AAChD,CAAC,CAAC,CAAC;AAEH,SAAS,yBAAyB,CAAC,IAAY,EAAE,YAAY,4BAAwB;IACjF,MAAM,KAAK,GAAG,IAAA,gCAAoB,EAAC,IAAI,CAAC,CAAC,KAAK,CAAC;IAE/C,MAAM,GAAG,GAAG,KAAK,CAAC,oBAAoB,CAAC,KAAK,CAAE,CAAC;IAC/C,MAAM,IAAI,GAAG,KAAK,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;IAE3C,MAAM,WAAW,GAAG,IAAI,yBAAW,CAAC,KAAK,CAAC,aAAa,EAAE,KAAK,CAAC,cAAc,EAAE,KAAK,CAAC,OAAO,CAAC,SAAU,CAAC,CAAC;IACzG,MAAM,UAAU,GAAG,WAAW,CAAC,4BAA4B,CACvD,KAAK,CAAC,OAAO,CAAC,kBAAkB,CAAC,GAAG,CAAC,QAAQ,CAAE,CAAC,eAAe,EAAG,EAClE,qBAAS,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,EACtC,yCAAiB,CAAC,IAAI,CACzB,CAAC;IAEF,MAAM,OAAO,GAAG,IAAI,iCAAe,EAAE,CAAC;IACtC,WAAW,CAAC,cAAc,CACtB,UAAU,EACV,KAAK,CAAC,OAAO,CAAC,kBAAkB,CAAC,IAAI,CAAC,QAAQ,CAAE,CAAC,eAAe,EAAG,EACnE,YAAY,EACZ,OAAO,EACP,yCAAiB,CAAC,IAAI,CACzB,CAAC;IAEF,WAAW,CAAC,OAAO,CAAC,QAAQ,CAAC,yCAAiB,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,CAAC;AACjE,CAAC;AAED,SAAS,cAAc,CAAC,IAAY,EAAE,YAAY,4BAAwB;IACtE,MAAM,KAAK,GAAG,IAAA,gCAAoB,EAAC,IAAI,CAAC,CAAC,KAAK,CAAC;IAE/C,MAAM,GAAG,GAAG,KAAK,CAAC,oBAAoB,CAAC,KAAK,CAAE,CAAC;IAC/C,MAAM,IAAI,GAAG,KAAK,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;IAE3C,MAAM,WAAW,GAAG,IAAI,yBAAW,CAAC,KAAK,CAAC,aAAa,EAAE,KAAK,CAAC,cAAc,EAAE,KAAK,CAAC,OAAO,CAAC,SAAU,CAAC,CAAC;IACzG,MAAM,UAAU,GAAG,WAAW,CAAC,4BAA4B,CACvD,KAAK,CAAC,OAAO,CAAC,kBAAkB,CAAC,GAAG,CAAC,QAAQ,CAAE,CAAC,eAAe,EAAG,EAClE,qBAAS,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,EACtC,yCAAiB,CAAC,IAAI,CACzB,CAAC;IAEF,MAAM,KAAK,GAAG,WAAW,CAAC,YAAY,CAClC,UAAU,EACV,IAAI,CAAC,QAAQ,EACb,KAAK,CAAC,OAAO,CAAC,kBAAkB,CAAC,IAAI,CAAC,QAAQ,CAAE,CAAC,eAAe,EAAG,EACnE,IAAI,CAAC,QAAQ,EACb,YAAY,EACZ,yCAAiB,CAAC,IAAI,CACzB,CAAC;IAEF,WAAW,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;AAC9B,CAAC;AAED,SAAS,WAAW,CAAC,KAAuB,EAAE,KAAgB;IAC1D,IAAA,gBAAM,EAAC,KAAK,CAAC,CAAC;IAEd,MAAM,QAAQ,GAAG,KAAK,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC;IACxD,MAAM,MAAM,GAAG,KAAK,CAAC,SAAS,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,WAAC,OAAA,CAAC,CAAC,CAAA,MAAA,CAAC,CAAC,MAAM,0CAAE,IAAI,CAAA,CAAA,EAAA,CAAC,CAAC;IACjE,gBAAM,CAAC,WAAW,CACd,KAAK,CAAC,MAAM,EACZ,MAAM,CAAC,MAAM,EACb,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,8CAA6B,EAAC,EAAE,QAAQ,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,MAAM;SACxF,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,6CAA4B,EAAC,KAAK,EAAE,CAAC,CAAC,CAAC;SAClD,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,8CAA6B,EAAC,CAAC,CAAC,CAAC;SAC5C,IAAI,CAAC,GAAG,CAAC,EAAE,CACnB,CAAC;IAEF,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;QACtB,IAAA,gBAAM,EACF,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;YACd,MAAM,IAAI,GAAG,CAAC,CAAC,MAAO,CAAC,IAAqB,CAAC;YAC7C,MAAM,YAAY,GAAG,IAAI,CAAC,CAAC,CAAC;YAC5B,MAAM,aAAa,GAAG,KAAK,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC;YACpD,OAAO,CACH,IAAA,0BAAc,EAAC,aAAa,EAAE,IAAI,CAAC,KAAK,CAAC;gBACzC,YAAY,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,KAAK,IAAI,CAAC,eAAe,CAC9D,CAAC;QACN,CAAC,CAAC,EACF,cAAc,IAAA,8CAA6B,EAAC,EAAE,QAAQ,EAAE,GAAG,IAAI,EAAE,CAAC,OAAO,MAAM;aAC1E,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,6CAA4B,EAAC,KAAK,EAAE,CAAC,CAAC,CAAC;aAClD,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,8CAA6B,EAAC,CAAC,CAAC,CAAC;aAC5C,IAAI,CAAC,GAAG,CAAC,EAAE,CACnB,CAAC;KACL;AACL,CAAC"}

package/dist/tests/indentationUtils.reindent.test.js

@@ -322,11 +322,32 @@ test('re-indentation tab on multiline text', () => {
 \t  pass`;
     testIndentation(code, 2, expected);
 });
+test('dont include token not contained in the span', () => {
+    const code = `
+//// import random
+////
+//// [|/*marker*/answer_word = random.choice(["a","b","c","d"])
+//// |]guess_word = "c"
+    `;
+    const expected = `answer_word = random.choice(["a","b","c","d"])`;
+    testIndentation(code, 0, expected);
+});
+test('handle comment before first token', () => {
+    const code = `
+//// [|/*marker*/# this function doesn't do much
+//// def myfunc(a, b):
+////     return a + b|]
+    `;
+    const expected = `# this function doesn't do much
+def myfunc(a, b):
+    return a + b`;
+    testIndentation(code, 0, expected);
+});
 function testIndentation(code, indentation, expected, indentFirstToken = true) {
     const state = (0, testState_1.parseAndGetTestState)(code).state;
     const range = state.getRangeByMarkerName('marker');
     const parseResults = state.program.getBoundSourceFile(range.fileName).getParseResults();
-    const actual = (0, indentationUtils_1.reindentSpan)(parseResults, textRange_1.TextRange.fromBounds(range.pos, range.end), indentation, indentFirstToken);
+    const actual = (0, indentationUtils_1.reindentSpan)(parseResults, textRange_1.TextRange.fromBounds(range.pos, range.end), indentation, indentFirstToken).text;
     assert_1.default.strictEqual(actual, expected);
 }
 //# sourceMappingURL=indentationUtils.reindent.test.js.map

package/dist/tests/indentationUtils.reindent.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"indentationUtils.reindent.test.js","sourceRoot":"","sources":["../../../src/tests/indentationUtils.reindent.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"indentationUtils.reindent.test.js","sourceRoot":"","sources":["../../../src/tests/indentationUtils.reindent.test.ts"],"names":[],"mappings":"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"}

package/dist/tests/moveSymbol.importAdder.test.js

@@ -12,44 +12,44 @@ const renameModuleTestUtils_1 = require("./renameModuleTestUtils");
 test('move imports used in the symbol', () => {
     const code = `
 // @filename: test.py
-//// from typing import List, Mapping
+//// [|{|"r":"!n!class MyType:!n!    pass!n!!n!"|}from typing import List, Mapping
 //// 
 //// class MyType:
 ////     pass
 //// 
-//// [|{|"r":""|}def [|/*marker*/foo|](a: str, b: List[int]) -> None:
+//// def [|/*marker*/foo|](a: str, b: List[int]) -> None:
 ////     c: Mapping[str, MyType] = { 'hello', MyType() }|]
 
 // @filename: moved.py
-//// [|{|"r":"from typing import List, Mapping!n!!n!!n!"|}|][|{|"r":"from test import MyType!n!!n!!n!"|}|][|{|"r":"def foo(a: str, b: List[int]) -> None:!n!    c: Mapping[str, MyType] = { 'hello', MyType() }", "name": "dest"|}|]
+//// [|{|"r":"from test import MyType!n!!n!!n!from typing import List, Mapping!n!!n!!n!def foo(a: str, b: List[int]) -> None:!n!    c: Mapping[str, MyType] = { 'hello', MyType() }", "name": "dest"|}|]
         `;
     testFromCode(code);
 });
 test('import with alias', () => {
     const code = `
 // @filename: test.py
-//// from typing import List as l, Mapping as m
+//// [|{|"r":"!n!class MyType:!n!    pass!n!!n!"|}from typing import List as l, Mapping as m
 //// 
 //// class MyType:
 ////     pass
 //// 
-//// [|{|"r":""|}def [|/*marker*/foo|](a: str, b: l[int]) -> None:
+//// def [|/*marker*/foo|](a: str, b: l[int]) -> None:
 ////     c: m[str, MyType] = { 'hello', MyType() }|]
 
 // @filename: moved.py
-//// [|{|"r":"from typing import List as l, Mapping as m!n!!n!!n!"|}|][|{|"r":"from test import MyType!n!!n!!n!"|}|][|{|"r":"def foo(a: str, b: l[int]) -> None:!n!    c: m[str, MyType] = { 'hello', MyType() }", "name": "dest"|}|]
+//// [|{|"r":"from test import MyType!n!!n!!n!from typing import List as l, Mapping as m!n!!n!!n!def foo(a: str, b: l[int]) -> None:!n!    c: m[str, MyType] = { 'hello', MyType() }", "name": "dest"|}|]
         `;
     testFromCode(code);
 });
 test('with existing imports', () => {
     const code = `
 // @filename: test.py
-//// from typing import List, Mapping
+//// [|{|"r":"!n!class MyType:!n!    pass!n!!n!"|}from typing import List, Mapping
 //// 
 //// class MyType:
 ////     pass
 //// 
-//// [|{|"r":""|}def [|/*marker*/foo|](a: str, b: List[int]) -> None:
+//// def [|/*marker*/foo|](a: str, b: List[int]) -> None:
 ////     c: Mapping[str, MyType] = { 'hello', MyType() }|]
 
 // @filename: moved.py
@@ -61,7 +61,7 @@ test('with existing imports', () => {
 test('merge with existing imports', () => {
     const code = `
 // @filename: test.py
-//// from typing import List, Mapping
+//// [|{|"r":"!n!class MyType:!n!    pass!n!!n!class MyType2(MyType):!n!    pass!n!!n!"|}from typing import List, Mapping
 //// 
 //// class MyType:
 ////     pass
@@ -69,25 +69,25 @@ test('merge with existing imports', () => {
 //// class MyType2(MyType):
 ////     pass
 //// 
-//// [|{|"r":""|}def [|/*marker*/foo|](a: str, b: List[int]) -> None:
+//// def [|/*marker*/foo|](a: str, b: List[int]) -> None:
 ////     c: Mapping[str, MyType] = { 'hello', MyType2() }|]
 
 // @filename: moved.py
-//// from typing import Mapping[|{|"r":"!n!from typing import List"|}|]
-//// from test import MyType[|{|"r":"!n!from test import MyType2"|}|]
-//// m = MyType()[|{|"r":"!n!!n!!n!def foo(a: str, b: List[int]) -> None:!n!    c: Mapping[str, MyType] = { 'hello', MyType2() }", "name": "dest"|}|]
+//// [|{|"r":"from typing import List, Mapping!n!from test import MyType, MyType2!n!m = MyType()!n!!n!!n!def foo(a: str, b: List[int]) -> None:!n!    c: Mapping[str, MyType] = { 'hello', MyType2() }", "name": "dest"|}from typing import Mapping
+//// from test import MyType
+//// m = MyType()|]
         `;
     testFromCode(code);
 });
 test('merge with existing moving symbol imports', () => {
     const code = `
 // @filename: test.py
-//// from typing import List, Mapping
+//// [|{|"r":"!n!class MyType:!n!    pass!n!!n!"|}from typing import List, Mapping
 //// 
 //// class MyType:
 ////     pass
 //// 
-//// [|{|"r":""|}def [|/*marker*/foo|](a: str, b: List[int]) -> None:
+//// def [|/*marker*/foo|](a: str, b: List[int]) -> None:
 ////     c: Mapping[str, MyType] = { 'hello', MyType() }|]
 
 // @filename: moved.py
@@ -101,39 +101,198 @@ test('merge with existing moving symbol imports', () => {
 test('merge with existing moving symbol imports and add new one', () => {
     const code = `
 // @filename: test.py
-//// from typing import List, Mapping
+//// [|{|"r":"!n!class MyType:!n!    pass!n!!n!"|}from typing import List, Mapping
 //// 
 //// class MyType:
 ////     pass
 //// 
-//// [|{|"r":""|}def [|/*marker*/foo|](a: str, b: List[int]) -> None:
+//// def [|/*marker*/foo|](a: str, b: List[int]) -> None:
 ////     c: Mapping[str, MyType] = { 'hello', MyType() }|]
 
 // @filename: moved.py
-//// from typing import List, Mapping
-//// [|{|"r":""|}from test import foo[|{|"r":"!n!from test import MyType"|}|][|{|"r":"!n!!n!!n!def foo(a: str, b: List[int]) -> None:!n!    c: Mapping[str, MyType] = { 'hello', MyType() }", "name": "dest"|}|]
+//// [|{|"r":"from typing import List, Mapping!n!!n!from test import MyType!n!!n!!n!def foo(a: str, b: List[int]) -> None:!n!    c: Mapping[str, MyType] = { 'hello', MyType() }!n!!n!foo()", "name": "dest"|}from typing import List, Mapping
+//// from test import foo
+//// 
+//// foo()|]
+        `;
+    testFromCode(code);
+});
+test('symbol from destination file used', () => {
+    const code = `
+// @filename: test.py
+//// [|{|"r":"!n!"|}from moved import MyType
+//// 
+//// def [|/*marker*/foo|](a: MyType) -> None:
+////     c: Mapping[str, MyType] = { 'hello', a }|]
+
+// @filename: moved.py
+//// class MyType:
+////     pass[|{|"r":"!n!!n!!n!def foo(a: MyType) -> None:!n!    c: Mapping[str, MyType] = { 'hello', a }", "name": "dest"|}|]
+////
+        `;
+    testFromCode(code);
+});
+test('insert after all symbols references', () => {
+    const code = `
+// @filename: test.py
+//// [|{|"r":"!n!"|}from moved import MyType
+//// 
+//// def [|/*marker*/foo|](a: MyType) -> None:
+////     c: Mapping[str, MyType] = { 'hello', a }|]
+
+// @filename: moved.py
+//// [|{|"r":""|}from test import foo
 //// |]
+//// class MyType:
+////     pass[|{|"r":"!n!!n!!n!def foo(a: MyType) -> None:!n!    c: Mapping[str, MyType] = { 'hello', a }", "name": "dest"|}|]
+////
 //// foo()
         `;
     testFromCode(code);
 });
-test('symbol from destination file used', () => {
+test('insert after all symbols references 2', () => {
     const code = `
 // @filename: test.py
-//// from moved import MyType
+//// [|{|"r":"!n!"|}from moved import MyType
 //// 
-//// [|{|"r":""|}def [|/*marker*/foo|](a: MyType) -> None:
+//// def [|/*marker*/foo|](a: MyType) -> None:
 ////     c: Mapping[str, MyType] = { 'hello', a }|]
 
 // @filename: moved.py
+//// def __privateFoo():
+////     pass
+////
 //// class MyType:
 ////     pass[|{|"r":"!n!!n!!n!def foo(a: MyType) -> None:!n!    c: Mapping[str, MyType] = { 'hello', a }", "name": "dest"|}|]
+        `;
+    testFromCode(code);
+});
+test('symbol used before all symbol references', () => {
+    const code = `
+// @filename: test.py
+//// [|{|"r":"!n!"|}from moved import MyType
+//// 
+//// def [|/*marker*/foo|](a: MyType) -> None:
+////     c: Mapping[str, MyType] = { 'hello', a }|]
+
+// @filename: moved.py
+//// [|{|"r":""|}from test import foo[|{|"r":"!n!!n!!n!def foo(a: MyType) -> None:!n!    c: Mapping[str, MyType] = { 'hello', a }", "name": "dest"|}|]
+//// |]
+//// foo()
+////
+//// class MyType:
+////     pass
+        `;
+    testFromCode(code);
+});
+test('symbol with import statements', () => {
+    const code = `
+// @filename: test.py
+//// [|{|"r": "import sys!n!!n!"|}import os, os.path, sys
+//// 
+//// def [|/*marker*/foo|]():
+////     p = os.path.curdir
+////     os.abort()|]
+
+// @filename: moved.py
+//// [|{|"r": "import os!n!import os.path!n!!n!!n!def foo():!n!    p = os.path.curdir!n!    os.abort()", "name": "dest"|}|]
+        `;
+    testFromCode(code);
+});
+test('symbol with import statements with alias', () => {
+    const code = `
+// @filename: test.py
+//// [|{|"r": "import sys!n!!n!"|}import os, os.path as path, sys
+//// 
+//// def [|/*marker*/foo|]():
+////     p = path.curdir
+////     os.abort()|]
+
+// @filename: moved.py
+//// [|{|"r": "import os!n!import os.path as path!n!!n!!n!def foo():!n!    p = path.curdir!n!    os.abort()", "name": "dest"|}|]
+        `;
+    testFromCode(code);
+});
+test('symbol with import statements with alias 2', () => {
+    const code = `
+// @filename: test.py
+//// [|{|"r": "import sys!n!!n!"|}import os, os.path as p1, sys
+//// 
+//// def [|/*marker*/foo|]():
+////     p = p1.curdir
+////     os.abort()|]
+
+// @filename: moved.py
+//// [|{|"r": "import os!n!import os.path as p1!n!!n!!n!def foo():!n!    p = p1.curdir!n!    os.abort()", "name": "dest"|}|]
+        `;
+    testFromCode(code);
+});
+test('symbol with import statements with multiple unused imports', () => {
+    const code = `
+// @filename: test.py
+//// [|{|"r": "import os.path, sys!n!!n!"|}import os, os.path, sys
+//// 
+//// def [|/*marker*/foo|]():
+////     os.abort()|]
+
+// @filename: moved.py
+//// [|{|"r": "import os!n!!n!!n!def foo():!n!    os.abort()", "name": "dest"|}|]
+        `;
+    testFromCode(code);
+});
+test('symbol with import statements with used imports', () => {
+    const code = `
+// @filename: test.py
+//// [|{|"r": "import os.path as path, sys!n!!n!p = path.curdir!n!!n!"|}import os, os.path as path, sys
+//// 
+//// p = path.curdir
 ////
+//// def [|/*marker*/foo|]():
+////     p = path.curdir
+////     os.abort()|]
+
+// @filename: moved.py
+//// [|{|"r": "import os!n!import os.path as path!n!!n!!n!def foo():!n!    p = path.curdir!n!    os.abort()", "name": "dest"|}|]
         `;
     testFromCode(code);
 });
-function testFromCode(code) {
+test('symbol with invalid import', () => {
+    const code = `
+// @filename: test.py
+//// import notExist
+//// 
+//// p = notExist.fooStr
+////
+//// [|{|"r": ""|}def [|/*marker*/foo|]():
+////     p = notExist.fooStr|]
+
+// @filename: moved.py
+//// [|{|"r": "def foo():!n!    p = notExist.fooStr", "name": "dest"|}|]
+        `;
+    testFromCode(code, true);
+});
+test('symbol with import with error', () => {
+    const code = `
+// @filename: test.py
+//// #pyright: strict
+//// import lib # should have no stub diagnostic
+//// 
+//// lib.bar()
+////
+//// [|{|"r": ""|}def [|/*marker*/foo|]():
+////     p = lib.bar()|]
+
+// @filename: lib/__init__.py
+// @library: true
+//// def bar(): pass
+
+// @filename: moved.py
+//// [|{|"r": "import lib!n!!n!!n!def foo():!n!    p = lib.bar()", "name": "dest"|}|]
+        `;
+    testFromCode(code, true);
+});
+function testFromCode(code, expectsMissingImport = false) {
     const state = (0, testState_1.parseAndGetTestState)(code).state;
-    (0, renameModuleTestUtils_1.testMoveSymbolAtPosition)(state, state.getMarkerByName('marker').fileName, state.getMarkerByName('dest').fileName, state.getPositionRange('marker').start);
+    (0, renameModuleTestUtils_1.testMoveSymbolAtPosition)(state, state.getMarkerByName('marker').fileName, state.getMarkerByName('dest').fileName, state.getPositionRange('marker').start, undefined, undefined, expectsMissingImport);
 }
 //# sourceMappingURL=moveSymbol.importAdder.test.js.map

package/dist/tests/moveSymbol.importAdder.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"moveSymbol.importAdder.test.js","sourceRoot":"","sources":["../../../src/tests/moveSymbol.importAdder.test.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;AAEH,6DAAqE;AACrE,mEAAmE;AAEnE,IAAI,CAAC,iCAAiC,EAAE,GAAG,EAAE;IACzC,MAAM,IAAI,GAAG;;;;;;;;;;;;SAYR,CAAC;IAEN,YAAY,CAAC,IAAI,CAAC,CAAC;AACvB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,mBAAmB,EAAE,GAAG,EAAE;IAC3B,MAAM,IAAI,GAAG;;;;;;;;;;;;SAYR,CAAC;IAEN,YAAY,CAAC,IAAI,CAAC,CAAC;AACvB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,uBAAuB,EAAE,GAAG,EAAE;IAC/B,MAAM,IAAI,GAAG;;;;;;;;;;;;;SAaR,CAAC;IAEN,YAAY,CAAC,IAAI,CAAC,CAAC;AACvB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,6BAA6B,EAAE,GAAG,EAAE;IACrC,MAAM,IAAI,GAAG;;;;;;;;;;;;;;;;;SAiBR,CAAC;IAEN,YAAY,CAAC,IAAI,CAAC,CAAC;AACvB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,2CAA2C,EAAE,GAAG,EAAE;IACnD,MAAM,IAAI,GAAG;;;;;;;;;;;;;;;SAeR,CAAC;IAEN,YAAY,CAAC,IAAI,CAAC,CAAC;AACvB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,2DAA2D,EAAE,GAAG,EAAE;IACnE,MAAM,IAAI,GAAG;;;;;;;;;;;;;;;SAeR,CAAC;IAEN,YAAY,CAAC,IAAI,CAAC,CAAC;AACvB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,mCAAmC,EAAE,GAAG,EAAE;IAC3C,MAAM,IAAI,GAAG;;;;;;;;;;;SAWR,CAAC;IAEN,YAAY,CAAC,IAAI,CAAC,CAAC;AACvB,CAAC,CAAC,CAAC;AACH,SAAS,YAAY,CAAC,IAAY;IAC9B,MAAM,KAAK,GAAG,IAAA,gCAAoB,EAAC,IAAI,CAAC,CAAC,KAAK,CAAC;IAE/C,IAAA,gDAAwB,EACpB,KAAK,EACL,KAAK,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,QAAQ,EACxC,KAAK,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,QAAQ,EACtC,KAAK,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC,KAAK,CACzC,CAAC;AACN,CAAC"}
+{"version":3,"file":"moveSymbol.importAdder.test.js","sourceRoot":"","sources":["../../../src/tests/moveSymbol.importAdder.test.ts"],"names":[],"mappings":"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"}

package/dist/tests/moveSymbol.insertion.test.js

@@ -274,8 +274,8 @@ test('insert to a file with same symbol imported with alias', () => {
 ////     pass|]
 
 // @filename: moved.py
-//// from [|{|"r":"moved"|}test|] import foo as aliasFoo
-////
+//// [|{|"r":""|}from test import foo as aliasFoo
+//// |]
 //// aliasFoo()[|{|"r":"!n!!n!def foo():!n!    pass", "name": "dest"|}|]
         `;
     testFromCode(code);
@@ -353,6 +353,141 @@ test('original file has import for the symbol with alias', () => {
         `;
     testFromCode(code);
 });
+test('move after class', () => {
+    const code = `
+// @filename: test.py
+//// [|{|"r":""|}def [|/*marker*/foo|]():
+////     pass
+//// |]
+
+// @filename: moved.py
+//// class A:
+////     def foo(self):
+////         pass[|{|"r":"!n!!n!!n!def foo():!n!    pass", "name": "dest"|}|]
+        `;
+    testFromCode(code);
+});
+test('move variable', () => {
+    const code = `
+// @filename: test.py
+//// [|{|"r":""|}[|/*marker*/A|] = 1|]
+
+// @filename: moved.py
+//// [|{|"r":"A = 1", "name": "dest"|}|]
+        `;
+    testFromCode(code);
+});
+test('move variable with doc string', () => {
+    const code = `
+// @filename: test.py
+//// [|{|"r":""|}[|/*marker*/A|] = 1
+//// '''
+////     doc string
+//// '''|]
+
+// @filename: moved.py
+//// [|{|"r":"A = 1!n!'''!n!    doc string!n!'''", "name": "dest"|}|]
+        `;
+    testFromCode(code);
+});
+test('move a variable with another variable next line', () => {
+    const code = `
+// @filename: test.py
+//// [|{|"r":"!n!guess_word = 'c'"|}import random
+//// 
+//// [|/*marker*/answer_word|] = random.choice(['a','b','c','d'])
+//// guess_word = 'c'|]
+
+// @filename: moved.py
+//// [|{|"r":"import random!n!!n!!n!answer_word = random.choice(['a','b','c','d'])", "name": "dest"|}|]
+    `;
+    testFromCode(code);
+});
+test('Handle comments at the begining better 1', () => {
+    const code = `
+// @filename: test.py
+//// # this function doesn't do much
+//// [|{|"r":""|}def [|/*marker*/myfunc|](a, b):
+////     return a + b|]
+
+// @filename: moved.py
+//// [|{|"r":"def myfunc(a, b):!n!    return a + b", "name": "dest"|}|]
+    `;
+    testFromCode(code);
+});
+test('Handle comments at the begining better 2', () => {
+    const code = `
+// @filename: test.py
+//// import os
+////
+//// [|{|"r":""|}# this function doesn't do much
+//// def [|/*marker*/myfunc|](a, b):
+////     return a + b|]
+
+// @filename: moved.py
+//// [|{|"r":"# this function doesn't do much!n!def myfunc(a, b):!n!    return a + b", "name": "dest"|}|]
+    `;
+    testFromCode(code);
+});
+test('variable with multiline expression', () => {
+    const code = `
+// @filename: test.py
+//// [|{|"r":"!n!"|}from functools import partial
+//// 
+//// [|/*marker*/sum1_2|] = partial(sum, 
+//// [1, 
+//// 2]
+//// )|]
+
+// @filename: moved.py
+//// [|{|"r":"from functools import partial!n!!n!!n!sum1_2 = partial(sum,!n![1,!n!2]!n!)", "name": "dest"|}|]
+    `;
+    testFromCode(code);
+});
+test('multiple variables in a single line 1', () => {
+    const code = `
+// @filename: test.py
+//// [|{|"r":""|}[|/*marker*/a|] = 1; |]b = 1
+
+// @filename: moved.py
+//// [|{|"r":"a = 1;", "name": "dest"|}|]
+    `;
+    testFromCode(code);
+});
+test('multiple variables in a single line 2', () => {
+    const code = `
+// @filename: test.py
+//// a = 1;[|{|"r":""|}[|/*marker*/b|] = 2|]
+
+// @filename: moved.py
+//// [|{|"r":"b = 2", "name": "dest"|}|]
+    `;
+    testFromCode(code);
+});
+test('multiple variables in multiple lines 1', () => {
+    const code = `
+// @filename: test.py
+//// [|{|"r":""|}[|/*marker*/a|] = \\
+////     1 + 2; |]b = 3 + \\
+////                4 
+
+// @filename: moved.py
+//// [|{|"r":"a = \\\\!n!    1 + 2;", "name": "dest"|}|]
+    `;
+    testFromCode(code);
+});
+test('multiple variables in multiple lines 2', () => {
+    const code = `
+// @filename: test.py
+//// a = \\
+////     1 + 2; [|{|"r":""|}[|/*marker*/b|] = 3 + \\
+////                4|]
+
+// @filename: moved.py
+//// [|{|"r":"b = 3 + \\\\!n!    4", "name": "dest"|}|]
+    `;
+    testFromCode(code);
+});
 function testFromCode(code) {
     const state = (0, testState_1.parseAndGetTestState)(code).state;
     (0, renameModuleTestUtils_1.testMoveSymbolAtPosition)(state, state.getMarkerByName('marker').fileName, state.getMarkerByName('dest').fileName, state.getPositionRange('marker').start);