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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (161) hide show
  1. package/dist/analyzer/backgroundAnalysisProgram.d.ts +1 -0
  2. package/dist/analyzer/backgroundAnalysisProgram.js +5 -0
  3. package/dist/analyzer/backgroundAnalysisProgram.js.map +1 -1
  4. package/dist/analyzer/checker.js +8 -5
  5. package/dist/analyzer/checker.js.map +1 -1
  6. package/dist/analyzer/commentUtils.d.ts +6 -1
  7. package/dist/analyzer/commentUtils.js +100 -25
  8. package/dist/analyzer/commentUtils.js.map +1 -1
  9. package/dist/analyzer/constraintSolver.js +83 -67
  10. package/dist/analyzer/constraintSolver.js.map +1 -1
  11. package/dist/analyzer/dataClasses.js +9 -2
  12. package/dist/analyzer/dataClasses.js.map +1 -1
  13. package/dist/analyzer/declaration.d.ts +1 -0
  14. package/dist/analyzer/declaration.js.map +1 -1
  15. package/dist/analyzer/importStatementUtils.d.ts +1 -0
  16. package/dist/analyzer/importStatementUtils.js +14 -1
  17. package/dist/analyzer/importStatementUtils.js.map +1 -1
  18. package/dist/analyzer/parameterUtils.d.ts +2 -0
  19. package/dist/analyzer/parameterUtils.js +20 -0
  20. package/dist/analyzer/parameterUtils.js.map +1 -0
  21. package/dist/analyzer/parseTreeUtils.d.ts +6 -2
  22. package/dist/analyzer/parseTreeUtils.js +52 -14
  23. package/dist/analyzer/parseTreeUtils.js.map +1 -1
  24. package/dist/analyzer/parseTreeWalker.d.ts +1 -1
  25. package/dist/analyzer/patternMatching.js +25 -5
  26. package/dist/analyzer/patternMatching.js.map +1 -1
  27. package/dist/analyzer/program.d.ts +9 -2
  28. package/dist/analyzer/program.js +106 -8
  29. package/dist/analyzer/program.js.map +1 -1
  30. package/dist/analyzer/service.d.ts +1 -4
  31. package/dist/analyzer/service.js +16 -36
  32. package/dist/analyzer/service.js.map +1 -1
  33. package/dist/analyzer/sourceFile.d.ts +4 -0
  34. package/dist/analyzer/sourceFile.js +82 -16
  35. package/dist/analyzer/sourceFile.js.map +1 -1
  36. package/dist/analyzer/testWalker.js +23 -15
  37. package/dist/analyzer/testWalker.js.map +1 -1
  38. package/dist/analyzer/typeEvaluator.js +122 -71
  39. package/dist/analyzer/typeEvaluator.js.map +1 -1
  40. package/dist/analyzer/typeEvaluatorTypes.d.ts +2 -1
  41. package/dist/analyzer/typeEvaluatorTypes.js.map +1 -1
  42. package/dist/analyzer/typePrinter.d.ts +2 -1
  43. package/dist/analyzer/typePrinter.js +13 -0
  44. package/dist/analyzer/typePrinter.js.map +1 -1
  45. package/dist/analyzer/typeUtils.d.ts +1 -1
  46. package/dist/analyzer/typeUtils.js +189 -142
  47. package/dist/analyzer/typeUtils.js.map +1 -1
  48. package/dist/analyzer/typeVarContext.d.ts +31 -14
  49. package/dist/analyzer/typeVarContext.js +158 -79
  50. package/dist/analyzer/typeVarContext.js.map +1 -1
  51. package/dist/analyzer/types.d.ts +2 -1
  52. package/dist/analyzer/types.js +1 -0
  53. package/dist/analyzer/types.js.map +1 -1
  54. package/dist/backgroundAnalysisBase.d.ts +2 -1
  55. package/dist/backgroundAnalysisBase.js +15 -1
  56. package/dist/backgroundAnalysisBase.js.map +1 -1
  57. package/dist/backgroundThreadBase.js +1 -0
  58. package/dist/backgroundThreadBase.js.map +1 -1
  59. package/dist/common/commandLineOptions.d.ts +2 -0
  60. package/dist/common/commandLineOptions.js.map +1 -1
  61. package/dist/common/configOptions.d.ts +3 -0
  62. package/dist/common/configOptions.js +10 -1
  63. package/dist/common/configOptions.js.map +1 -1
  64. package/dist/common/core.d.ts +2 -0
  65. package/dist/common/core.js +9 -1
  66. package/dist/common/core.js.map +1 -1
  67. package/dist/common/diagnostic.d.ts +15 -3
  68. package/dist/common/diagnostic.js +13 -4
  69. package/dist/common/diagnostic.js.map +1 -1
  70. package/dist/common/editAction.d.ts +1 -0
  71. package/dist/common/editAction.js +8 -0
  72. package/dist/common/editAction.js.map +1 -1
  73. package/dist/common/extensibility.d.ts +34 -11
  74. package/dist/common/extensibility.js +63 -18
  75. package/dist/common/extensibility.js.map +1 -1
  76. package/dist/common/pathUtils.d.ts +3 -0
  77. package/dist/common/pathUtils.js +18 -0
  78. package/dist/common/pathUtils.js.map +1 -1
  79. package/dist/common/textEditUtils.d.ts +26 -9
  80. package/dist/common/textEditUtils.js +218 -41
  81. package/dist/common/textEditUtils.js.map +1 -1
  82. package/dist/common/textRangeCollection.d.ts +1 -0
  83. package/dist/common/textRangeCollection.js +54 -20
  84. package/dist/common/textRangeCollection.js.map +1 -1
  85. package/dist/languageServerBase.d.ts +3 -0
  86. package/dist/languageServerBase.js +90 -1
  87. package/dist/languageServerBase.js.map +1 -1
  88. package/dist/languageService/analyzerServiceExecutor.js +1 -0
  89. package/dist/languageService/analyzerServiceExecutor.js.map +1 -1
  90. package/dist/languageService/completionProvider.js +13 -7
  91. package/dist/languageService/completionProvider.js.map +1 -1
  92. package/dist/languageService/definitionProvider.js +1 -1
  93. package/dist/languageService/definitionProvider.js.map +1 -1
  94. package/dist/languageService/documentSymbolCollector.js +1 -1
  95. package/dist/languageService/documentSymbolCollector.js.map +1 -1
  96. package/dist/languageService/hoverProvider.js +10 -6
  97. package/dist/languageService/hoverProvider.js.map +1 -1
  98. package/dist/languageService/importAdder.d.ts +4 -0
  99. package/dist/languageService/importAdder.js +50 -13
  100. package/dist/languageService/importAdder.js.map +1 -1
  101. package/dist/languageService/insertionPointUtils.js +28 -7
  102. package/dist/languageService/insertionPointUtils.js.map +1 -1
  103. package/dist/languageService/renameModuleProvider.d.ts +12 -10
  104. package/dist/languageService/renameModuleProvider.js +240 -229
  105. package/dist/languageService/renameModuleProvider.js.map +1 -1
  106. package/dist/languageService/signatureHelpProvider.js +20 -3
  107. package/dist/languageService/signatureHelpProvider.js.map +1 -1
  108. package/dist/languageService/tooltipUtils.js +1 -1
  109. package/dist/languageService/tooltipUtils.js.map +1 -1
  110. package/dist/localization/localize.d.ts +10 -1
  111. package/dist/localization/localize.js +6 -1
  112. package/dist/localization/localize.js.map +1 -1
  113. package/dist/localization/package.nls.en-us.json +8 -2
  114. package/dist/tests/checker.test.js +5 -0
  115. package/dist/tests/checker.test.js.map +1 -1
  116. package/dist/tests/fourslash/completions.params.fourslash.js +37 -0
  117. package/dist/tests/fourslash/completions.params.fourslash.js.map +1 -1
  118. package/dist/tests/fourslash/hover.inferred.fourslash.d.ts +1 -0
  119. package/dist/tests/fourslash/hover.inferred.fourslash.js +24 -0
  120. package/dist/tests/fourslash/hover.inferred.fourslash.js.map +1 -0
  121. package/dist/tests/fourslash/signature.complicated.fourslash.js +31 -1
  122. package/dist/tests/fourslash/signature.complicated.fourslash.js.map +1 -1
  123. package/dist/tests/hoverProvider.test.js +27 -0
  124. package/dist/tests/hoverProvider.test.js.map +1 -1
  125. package/dist/tests/importAdder.test.js +39 -2
  126. package/dist/tests/importAdder.test.js.map +1 -1
  127. package/dist/tests/insertionPointUtils.test.js +70 -3
  128. package/dist/tests/insertionPointUtils.test.js.map +1 -1
  129. package/dist/tests/{updateSymbolReference.test.d.ts → moveSymbol.importAdder.test.d.ts} +0 -0
  130. package/dist/tests/moveSymbol.importAdder.test.js +139 -0
  131. package/dist/tests/moveSymbol.importAdder.test.js.map +1 -0
  132. package/dist/tests/moveSymbol.insertion.test.d.ts +1 -0
  133. package/dist/tests/moveSymbol.insertion.test.js +360 -0
  134. package/dist/tests/moveSymbol.insertion.test.js.map +1 -0
  135. package/dist/tests/moveSymbol.misc.test.d.ts +1 -0
  136. package/dist/tests/moveSymbol.misc.test.js +37 -0
  137. package/dist/tests/moveSymbol.misc.test.js.map +1 -0
  138. package/dist/tests/moveSymbol.updateReference.test.d.ts +1 -0
  139. package/dist/tests/{updateSymbolReference.test.js → moveSymbol.updateReference.test.js} +235 -158
  140. package/dist/tests/moveSymbol.updateReference.test.js.map +1 -0
  141. package/dist/tests/parseTreeUtils.test.js +36 -13
  142. package/dist/tests/parseTreeUtils.test.js.map +1 -1
  143. package/dist/tests/renameModuleTestUtils.js +9 -3
  144. package/dist/tests/renameModuleTestUtils.js.map +1 -1
  145. package/dist/tests/testStateUtils.d.ts +2 -0
  146. package/dist/tests/testStateUtils.js +25 -22
  147. package/dist/tests/testStateUtils.js.map +1 -1
  148. package/dist/tests/textEditUtil.test.d.ts +1 -0
  149. package/dist/tests/textEditUtil.test.js +107 -0
  150. package/dist/tests/textEditUtil.test.js.map +1 -0
  151. package/dist/tests/typeEvaluator1.test.js +4 -0
  152. package/dist/tests/typeEvaluator1.test.js.map +1 -1
  153. package/dist/tests/typeEvaluator3.test.js +2 -2
  154. package/dist/tests/typeEvaluator3.test.js.map +1 -1
  155. package/dist/tests/typeEvaluator4.test.js +10 -2
  156. package/dist/tests/typeEvaluator4.test.js.map +1 -1
  157. package/dist/workspaceMap.d.ts +0 -1
  158. package/dist/workspaceMap.js +0 -11
  159. package/dist/workspaceMap.js.map +1 -1
  160. package/package.json +1 -1
  161. package/dist/tests/updateSymbolReference.test.js.map +0 -1
@@ -0,0 +1 @@
1
+ {"version":3,"file":"moveSymbol.updateReference.test.js","sourceRoot":"","sources":["../../../src/tests/moveSymbol.updateReference.test.ts"],"names":[],"mappings":"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"}
@@ -217,18 +217,41 @@ test('getFullStatementRange', () => {
217
217
  //// pass|]
218
218
  `;
219
219
  const state = (0, testState_1.parseAndGetTestState)(code).state;
220
- testRange(state, 'marker1', 20 /* Import */);
221
- testRange(state, 'marker2', 3 /* Assignment */);
222
- testRange(state, 'marker3', 3 /* Assignment */);
223
- testRange(state, 'marker4', 3 /* Assignment */);
224
- testRange(state, 'marker5', 19 /* If */);
225
- function testRange(state, markerName, type) {
226
- const range = state.getRangeByMarkerName(markerName);
227
- const sourceFile = state.program.getBoundSourceFile(range.marker.fileName);
228
- const statementNode = (0, parseTreeUtils_1.getFirstAncestorOrSelfOfKind)((0, testState_1.getNodeAtMarker)(state, markerName), type);
229
- const statementRange = (0, parseTreeUtils_1.getFullStatementRange)(statementNode, sourceFile.getParseResults().tokenizerOutput);
230
- const expectedRange = state.convertPositionRange(range);
231
- (0, assert_1.default)((0, textRange_1.rangesAreEqual)(expectedRange, statementRange));
232
- }
220
+ testNodeRange(state, 'marker1', 20 /* Import */);
221
+ testNodeRange(state, 'marker2', 3 /* Assignment */);
222
+ testNodeRange(state, 'marker3', 3 /* Assignment */);
223
+ testNodeRange(state, 'marker4', 3 /* Assignment */);
224
+ testNodeRange(state, 'marker5', 19 /* If */);
225
+ });
226
+ test('getFullStatementRange with trailing blank lines', () => {
227
+ const code = `
228
+ //// [|/*marker*/def foo():
229
+ //// return 1
230
+ ////
231
+ //// |]def bar():
232
+ //// pass
233
+ `;
234
+ const state = (0, testState_1.parseAndGetTestState)(code).state;
235
+ testNodeRange(state, 'marker', 28 /* Function */, true);
236
+ });
237
+ test('getFullStatementRange with only trailing blank lines', () => {
238
+ const code = `
239
+ //// [|/*marker*/def foo():
240
+ //// return 1
241
+ //// |]
242
+ ////
243
+ `;
244
+ const state = (0, testState_1.parseAndGetTestState)(code).state;
245
+ testNodeRange(state, 'marker', 28 /* Function */, true);
233
246
  });
247
+ function testNodeRange(state, markerName, type, includeTrailingBlankLines = false) {
248
+ const range = state.getRangeByMarkerName(markerName);
249
+ const sourceFile = state.program.getBoundSourceFile(range.marker.fileName);
250
+ const statementNode = (0, parseTreeUtils_1.getFirstAncestorOrSelfOfKind)((0, testState_1.getNodeAtMarker)(state, markerName), type);
251
+ const statementRange = (0, parseTreeUtils_1.getFullStatementRange)(statementNode, sourceFile.getParseResults(), {
252
+ includeTrailingBlankLines,
253
+ });
254
+ const expectedRange = state.convertPositionRange(range);
255
+ (0, assert_1.default)((0, textRange_1.rangesAreEqual)(expectedRange, statementRange));
256
+ }
234
257
  //# sourceMappingURL=parseTreeUtils.test.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"parseTreeUtils.test.js","sourceRoot":"","sources":["../../../src/tests/parseTreeUtils.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"parseTreeUtils.test.js","sourceRoot":"","sources":["../../../src/tests/parseTreeUtils.test.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;AAEH,oDAA4B;AAE5B,+DAcoC;AACpC,mDAAgE;AAEhE,6DAAkH;AAElH,IAAI,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAC5B,MAAM,IAAI,GAAG;;KAEZ,CAAC;IAEF,IAAA,gBAAM,EAAC,IAAA,mCAAkB,EAAC,IAAA,2BAAe,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACtD,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,eAAe,EAAE,GAAG,EAAE;IACvB,MAAM,IAAI,GAAG;;KAEZ,CAAC;IAEF,IAAA,gBAAM,EAAC,IAAA,8BAAa,EAAC,IAAA,2BAAe,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACjD,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,wBAAwB,EAAE,GAAG,EAAE;IAChC,MAAM,IAAI,GAAG;;KAEZ,CAAC;IAEF,IAAA,gBAAM,EAAC,IAAA,uCAAsB,EAAC,IAAA,2BAAe,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAC1D,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,kBAAkB,EAAE,GAAG,EAAE;IAC1B,MAAM,IAAI,GAAG;;KAEZ,CAAC;IAEF,IAAA,gBAAM,EAAC,IAAA,iCAAgB,EAAC,IAAA,2BAAe,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACpD,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,mBAAmB,EAAE,GAAG,EAAE;IAC3B,MAAM,IAAI,GAAG;;KAEZ,CAAC;IAEF,IAAA,gBAAM,EAAC,IAAA,kCAAiB,EAAC,IAAA,2BAAe,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACrD,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,8BAA8B,EAAE,GAAG,EAAE;IACtC,MAAM,IAAI,GAAG;;;;;;;;KAQZ,CAAC;IAEF,MAAM,KAAK,GAAG,IAAA,gCAAoB,EAAC,IAAI,CAAC,CAAC,KAAK,CAAC;IAC/C,MAAM,IAAI,GAAG,IAAA,6CAA4B,EAAC,IAAA,2BAAe,EAAC,KAAK,CAAC,eAAqB,CAAC;IACtF,IAAA,gBAAM,EAAC,IAAI,CAAC,CAAC;IAEb,MAAM,MAAM,GAAG,KAAK,CAAC,oBAAoB,CAAC,QAAQ,CAAE,CAAC;IACrD,IAAA,gBAAM,EAAC,IAAI,CAAC,QAAQ,iBAAuB,CAAC,CAAC;IAC7C,IAAA,gBAAM,EAAC,IAAI,CAAC,KAAK,KAAK,MAAM,CAAC,GAAG,CAAC,CAAC;IAClC,IAAA,gBAAM,EAAC,qBAAS,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,MAAM,CAAC,GAAG,CAAC,CAAC;AAClD,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,sCAAsC,EAAE,GAAG,EAAE;IAC9C,MAAM,IAAI,GAAG;;;;;;KAMZ,CAAC;IAEF,MAAM,KAAK,GAAG,IAAA,gCAAoB,EAAC,IAAI,CAAC,CAAC,KAAK,CAAC;IAE/C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE;QACzB,MAAM,UAAU,GAAG,QAAQ,GAAG,CAAC,CAAC;QAChC,MAAM,UAAU,GAAG,QAAQ,GAAG,CAAC,CAAC;QAChC,MAAM,IAAI,GAAG,IAAA,qDAAoC,EAAC,IAAA,2BAAe,EAAC,KAAK,EAAE,UAAU,CAAa,CAAC,CAAC;QAClG,MAAM,MAAM,GAAG,KAAK,CAAC,oBAAoB,CAAC,UAAU,CAAE,CAAC;QAEvD,IAAA,gBAAM,EAAC,IAAI,CAAC,QAAQ,kBAAuB,IAAI,IAAI,CAAC,QAAQ,0BAA+B,CAAC,CAAC;QAC7F,IAAA,gBAAM,EAAC,IAAI,CAAC,KAAK,KAAK,MAAM,CAAC,GAAG,CAAC,CAAC;QAClC,IAAA,gBAAM,EAAC,qBAAS,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,MAAM,CAAC,GAAG,CAAC,CAAC;KACjD;AACL,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,eAAe,EAAE,GAAG,EAAE;IACvB,MAAM,IAAI,GAAG;;;;;;KAMZ,CAAC;IAEF,MAAM,KAAK,GAAG,IAAA,gCAAoB,EAAC,IAAI,CAAC,CAAC,KAAK,CAAC;IAE/C,gBAAM,CAAC,WAAW,CAAC,mBAAmB,CAAC,SAAS,CAAC,EAAE,GAAG,CAAC,CAAC;IACxD,gBAAM,CAAC,WAAW,CAAC,mBAAmB,CAAC,SAAS,CAAC,EAAE,KAAK,CAAC,CAAC;IAC1D,gBAAM,CAAC,WAAW,CAAC,mBAAmB,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC,CAAC;IAC5D,gBAAM,CAAC,WAAW,CAAC,mBAAmB,CAAC,SAAS,CAAC,EAAE,KAAK,CAAC,CAAC;IAC1D,gBAAM,CAAC,WAAW,CAAC,mBAAmB,CAAC,SAAS,CAAC,EAAE,GAAG,CAAC,CAAC;IAExD,SAAS,mBAAmB,CAAC,MAAc;;QACvC,MAAM,IAAI,GAAG,IAAA,2BAAe,EAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAC5C,OAAO,MAAA,IAAA,8BAAa,EAAC,IAAmC,CAAC,0CACnD,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,EACnB,IAAI,CAAC,GAAG,CAAC,CAAC;IACnB,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,0BAA0B,EAAE,GAAG,EAAE;IAClC,MAAM,IAAI,GAAG;;;;;;SAMR,CAAC;IAEN,MAAM,KAAK,GAAG,IAAA,gCAAoB,EAAC,IAAI,CAAC,CAAC,KAAK,CAAC;IAE/C,gBAAM,CAAC,WAAW,CAAC,mBAAmB,CAAC,SAAS,CAAC,EAAE,GAAG,CAAC,CAAC;IACxD,gBAAM,CAAC,WAAW,CAAC,mBAAmB,CAAC,SAAS,CAAC,EAAE,GAAG,CAAC,CAAC;IACxD,gBAAM,CAAC,WAAW,CAAC,mBAAmB,CAAC,SAAS,CAAC,EAAE,GAAG,CAAC,CAAC;IACxD,gBAAM,CAAC,WAAW,CAAC,mBAAmB,CAAC,SAAS,CAAC,EAAE,GAAG,CAAC,CAAC;IACxD,gBAAM,CAAC,WAAW,CAAC,mBAAmB,CAAC,SAAS,CAAC,EAAE,GAAG,CAAC,CAAC;IAExD,SAAS,mBAAmB,CAAC,MAAc;;QACvC,MAAM,IAAI,GAAG,IAAA,2BAAe,EAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAC5C,OAAO,MAAA,MAAA,IAAA,yCAAwB,EAAC,IAAmC,CAAC,0CAAE,KAAK,mCAAI,EAAE,CAAC;IACtF,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,wBAAwB,EAAE,GAAG,EAAE;IAChC,MAAM,IAAI,GAAG;;;;;;;;;;;;;;;KAeZ,CAAC;IAEF,MAAM,KAAK,GAAG,IAAA,gCAAoB,EAAC,IAAI,CAAC,CAAC,KAAK,CAAC;IAE/C,gBAAM,CAAC,WAAW,CAAC,IAAA,uCAAsB,EAAC,IAAA,2BAAe,EAAC,KAAK,EAAE,SAAS,CAAa,CAAC,EAAE,IAAI,CAAC,CAAC;IAChG,gBAAM,CAAC,WAAW,CAAC,IAAA,uCAAsB,EAAC,IAAA,2BAAe,EAAC,KAAK,EAAE,SAAS,CAAa,CAAC,EAAE,IAAI,CAAC,CAAC;IAChG,gBAAM,CAAC,WAAW,CAAC,IAAA,uCAAsB,EAAC,IAAA,2BAAe,EAAC,KAAK,EAAE,SAAS,CAAa,CAAC,EAAE,IAAI,CAAC,CAAC;IAChG,gBAAM,CAAC,WAAW,CAAC,IAAA,uCAAsB,EAAC,IAAA,2BAAe,EAAC,KAAK,EAAE,SAAS,CAAa,CAAC,EAAE,KAAK,CAAC,CAAC;IACjG,gBAAM,CAAC,WAAW,CAAC,IAAA,uCAAsB,EAAC,IAAA,2BAAe,EAAC,KAAK,EAAE,SAAS,CAAa,CAAC,EAAE,KAAK,CAAC,CAAC;IACjG,gBAAM,CAAC,WAAW,CAAC,IAAA,uCAAsB,EAAC,IAAA,2BAAe,EAAC,KAAK,EAAE,SAAS,CAAa,CAAC,EAAE,IAAI,CAAC,CAAC;IAChG,gBAAM,CAAC,WAAW,CAAC,IAAA,uCAAsB,EAAC,IAAA,2BAAe,EAAC,KAAK,EAAE,SAAS,CAAa,CAAC,EAAE,IAAI,CAAC,CAAC;IAChG,gBAAM,CAAC,WAAW,CAAC,IAAA,uCAAsB,EAAC,IAAA,2BAAe,EAAC,KAAK,EAAE,SAAS,CAAa,CAAC,EAAE,KAAK,CAAC,CAAC;IACjG,gBAAM,CAAC,WAAW,CAAC,IAAA,uCAAsB,EAAC,IAAA,2BAAe,EAAC,KAAK,EAAE,SAAS,CAAa,CAAC,EAAE,KAAK,CAAC,CAAC;IACjG,gBAAM,CAAC,WAAW,CAAC,IAAA,uCAAsB,EAAC,IAAA,2BAAe,EAAC,KAAK,EAAE,UAAU,CAAa,CAAC,EAAE,IAAI,CAAC,CAAC;IACjG,gBAAM,CAAC,WAAW,CAAC,IAAA,uCAAsB,EAAC,IAAA,2BAAe,EAAC,KAAK,EAAE,UAAU,CAAa,CAAC,EAAE,IAAI,CAAC,CAAC;IACjG,gBAAM,CAAC,WAAW,CAAC,IAAA,uCAAsB,EAAC,IAAA,2BAAe,EAAC,KAAK,EAAE,UAAU,CAAa,CAAC,EAAE,KAAK,CAAC,CAAC;IAClG,gBAAM,CAAC,WAAW,CAAC,IAAA,uCAAsB,EAAC,IAAA,2BAAe,EAAC,KAAK,EAAE,UAAU,CAAa,CAAC,EAAE,IAAI,CAAC,CAAC;IACjG,gBAAM,CAAC,WAAW,CAAC,IAAA,uCAAsB,EAAC,IAAA,2BAAe,EAAC,KAAK,EAAE,UAAU,CAAa,CAAC,EAAE,IAAI,CAAC,CAAC;AACrG,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,yBAAyB,EAAE,GAAG,EAAE;IACjC,MAAM,IAAI,GAAG;;;;;;;;;;;;;;;;KAgBZ,CAAC;IAEF,MAAM,KAAK,GAAG,IAAA,gCAAoB,EAAC,IAAI,CAAC,CAAC,KAAK,CAAC;IAE/C,gBAAM,CAAC,WAAW,CAAC,IAAA,wCAAuB,EAAC,IAAA,2BAAe,EAAC,KAAK,EAAE,SAAS,CAAa,CAAC,EAAE,IAAI,CAAC,CAAC;IACjG,gBAAM,CAAC,WAAW,CAAC,IAAA,wCAAuB,EAAC,IAAA,2BAAe,EAAC,KAAK,EAAE,SAAS,CAAa,CAAC,EAAE,KAAK,CAAC,CAAC;IAClG,gBAAM,CAAC,WAAW,CAAC,IAAA,wCAAuB,EAAC,IAAA,2BAAe,EAAC,KAAK,EAAE,SAAS,CAAa,CAAC,EAAE,KAAK,CAAC,CAAC;IAClG,gBAAM,CAAC,WAAW,CAAC,IAAA,wCAAuB,EAAC,IAAA,2BAAe,EAAC,KAAK,EAAE,SAAS,CAAa,CAAC,EAAE,KAAK,CAAC,CAAC;IAClG,gBAAM,CAAC,WAAW,CAAC,IAAA,wCAAuB,EAAC,IAAA,2BAAe,EAAC,KAAK,EAAE,SAAS,CAAa,CAAC,EAAE,IAAI,CAAC,CAAC;IACjG,gBAAM,CAAC,WAAW,CAAC,IAAA,wCAAuB,EAAC,IAAA,2BAAe,EAAC,KAAK,EAAE,SAAS,CAAa,CAAC,EAAE,IAAI,CAAC,CAAC;IACjG,gBAAM,CAAC,WAAW,CAAC,IAAA,wCAAuB,EAAC,IAAA,2BAAe,EAAC,KAAK,EAAE,SAAS,CAAa,CAAC,EAAE,KAAK,CAAC,CAAC;IAClG,gBAAM,CAAC,WAAW,CAAC,IAAA,wCAAuB,EAAC,IAAA,2BAAe,EAAC,KAAK,EAAE,SAAS,CAAa,CAAC,EAAE,IAAI,CAAC,CAAC;IACjG,gBAAM,CAAC,WAAW,CAAC,IAAA,wCAAuB,EAAC,IAAA,2BAAe,EAAC,KAAK,EAAE,SAAS,CAAa,CAAC,EAAE,KAAK,CAAC,CAAC;IAClG,gBAAM,CAAC,WAAW,CAAC,IAAA,wCAAuB,EAAC,IAAA,2BAAe,EAAC,KAAK,EAAE,UAAU,CAAa,CAAC,EAAE,IAAI,CAAC,CAAC;IAClG,gBAAM,CAAC,WAAW,CAAC,IAAA,wCAAuB,EAAC,IAAA,2BAAe,EAAC,KAAK,EAAE,UAAU,CAAa,CAAC,EAAE,IAAI,CAAC,CAAC;IAClG,gBAAM,CAAC,WAAW,CAAC,IAAA,wCAAuB,EAAC,IAAA,2BAAe,EAAC,KAAK,EAAE,UAAU,CAAa,CAAC,EAAE,KAAK,CAAC,CAAC;IACnG,gBAAM,CAAC,WAAW,CAAC,IAAA,wCAAuB,EAAC,IAAA,2BAAe,EAAC,KAAK,EAAE,UAAU,CAAa,CAAC,EAAE,IAAI,CAAC,CAAC;IAClG,gBAAM,CAAC,WAAW,CAAC,IAAA,wCAAuB,EAAC,IAAA,2BAAe,EAAC,KAAK,EAAE,UAAU,CAAa,CAAC,EAAE,KAAK,CAAC,CAAC;IACnG,gBAAM,CAAC,WAAW,CAAC,IAAA,wCAAuB,EAAC,IAAA,2BAAe,EAAC,KAAK,EAAE,UAAU,CAAa,CAAC,EAAE,IAAI,CAAC,CAAC;AACtG,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,yBAAyB,EAAE,GAAG,EAAE;IACjC,MAAM,IAAI,GAAG;;;;KAIZ,CAAC;IAEF,MAAM,KAAK,GAAG,IAAA,gCAAoB,EAAC,IAAI,CAAC,CAAC,KAAK,CAAC;IAE/C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE;QACzB,MAAM,UAAU,GAAG,QAAQ,GAAG,CAAC,CAAC;QAChC,MAAM,KAAK,GAAG,IAAA,wCAAuB,EAAC,IAAA,2BAAe,EAAC,KAAK,EAAE,UAAU,CAAe,CAAC,CAAC;QACxF,MAAM,MAAM,GAAG,KAAK,CAAC,oBAAoB,CAAC,UAAU,CAAE,CAAC;QAEvD,IAAA,gBAAM,EAAC,KAAK,CAAC,KAAK,KAAK,MAAM,CAAC,GAAG,CAAC,CAAC;QACnC,IAAA,gBAAM,EAAC,qBAAS,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,MAAM,CAAC,GAAG,CAAC,CAAC;KAClD;AACL,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,uBAAuB,EAAE,GAAG,EAAE;IAC/B,MAAM,IAAI,GAAG;;;;;;;;;;KAUZ,CAAC;IAEF,MAAM,KAAK,GAAG,IAAA,gCAAoB,EAAC,IAAI,CAAC,CAAC,KAAK,CAAC;IAE/C,aAAa,CAAC,KAAK,EAAE,SAAS,kBAAuB,CAAC;IACtD,aAAa,CAAC,KAAK,EAAE,SAAS,qBAA2B,CAAC;IAC1D,aAAa,CAAC,KAAK,EAAE,SAAS,qBAA2B,CAAC;IAC1D,aAAa,CAAC,KAAK,EAAE,SAAS,qBAA2B,CAAC;IAC1D,aAAa,CAAC,KAAK,EAAE,SAAS,cAAmB,CAAC;AACtD,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,iDAAiD,EAAE,GAAG,EAAE;IACzD,MAAM,IAAI,GAAG;;;;;;KAMZ,CAAC;IAEF,MAAM,KAAK,GAAG,IAAA,gCAAoB,EAAC,IAAI,CAAC,CAAC,KAAK,CAAC;IAE/C,aAAa,CAAC,KAAK,EAAE,QAAQ,qBAA0B,IAAI,CAAC,CAAC;AACjE,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,sDAAsD,EAAE,GAAG,EAAE;IAC9D,MAAM,IAAI,GAAG;;;;;KAKZ,CAAC;IAEF,MAAM,KAAK,GAAG,IAAA,gCAAoB,EAAC,IAAI,CAAC,CAAC,KAAK,CAAC;IAE/C,aAAa,CAAC,KAAK,EAAE,QAAQ,qBAA0B,IAAI,CAAC,CAAC;AACjE,CAAC,CAAC,CAAC;AAEH,SAAS,aAAa,CAAC,KAAgB,EAAE,UAAkB,EAAE,IAAmB,EAAE,yBAAyB,GAAG,KAAK;IAC/G,MAAM,KAAK,GAAG,KAAK,CAAC,oBAAoB,CAAC,UAAU,CAAE,CAAC;IACtD,MAAM,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,kBAAkB,CAAC,KAAK,CAAC,MAAO,CAAC,QAAQ,CAAE,CAAC;IAE7E,MAAM,aAAa,GAAG,IAAA,6CAA4B,EAAC,IAAA,2BAAe,EAAC,KAAK,EAAE,UAAU,CAAC,EAAE,IAAI,CAAE,CAAC;IAC9F,MAAM,cAAc,GAAG,IAAA,sCAAqB,EAAC,aAAa,EAAE,UAAU,CAAC,eAAe,EAAG,EAAE;QACvF,yBAAyB;KAC5B,CAAC,CAAC;IAEH,MAAM,aAAa,GAAG,KAAK,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;IAExD,IAAA,gBAAM,EAAC,IAAA,0BAAc,EAAC,aAAa,EAAE,cAAc,CAAC,CAAC,CAAC;AAC1D,CAAC"}
@@ -17,7 +17,7 @@ const collectionUtils_1 = require("../common/collectionUtils");
17
17
  const diagnosticRules_1 = require("../common/diagnosticRules");
18
18
  const testStateUtils_1 = require("./testStateUtils");
19
19
  function testMoveSymbolAtPosition(state, filePath, newFilePath, position, text, replacementText) {
20
- const actions = state.program.moveSymbolAtPosition(filePath, newFilePath, position, vscode_languageserver_1.CancellationToken.None);
20
+ const actions = state.program.moveSymbolAtPosition(filePath, newFilePath, position, { importFormat: "absolute" /* Absolute */ }, vscode_languageserver_1.CancellationToken.None);
21
21
  (0, assert_1.default)(actions);
22
22
  const ranges = [];
23
23
  if (text !== undefined) {
@@ -26,7 +26,10 @@ function testMoveSymbolAtPosition(state, filePath, newFilePath, position, text,
26
26
  else {
27
27
  (0, collectionUtils_1.appendArray)(ranges, state.getRanges().filter((r) => { var _a; return !!((_a = r.marker) === null || _a === void 0 ? void 0 : _a.data); }));
28
28
  }
29
- assert_1.default.strictEqual(actions.edits.length, ranges.length);
29
+ assert_1.default.strictEqual(actions.edits.length, ranges.length, `${actions.edits.map((e) => (0, testStateUtils_1.convertFileEditActionToString)(e)).join('|')} vs ${ranges
30
+ .map((r) => (0, testStateUtils_1.convertRangeToFileEditAction)(state, r, replacementText))
31
+ .map((e) => (0, testStateUtils_1.convertFileEditActionToString)(e))
32
+ .join('|')}`);
30
33
  _verifyFileOperations(state, actions, ranges, replacementText);
31
34
  }
32
35
  exports.testMoveSymbolAtPosition = testMoveSymbolAtPosition;
@@ -40,7 +43,10 @@ function testRenameModule(state, filePath, newFilePath, text, replacementText) {
40
43
  else {
41
44
  (0, collectionUtils_1.appendArray)(ranges, state.getRanges().filter((r) => { var _a; return !!((_a = r.marker) === null || _a === void 0 ? void 0 : _a.data); }));
42
45
  }
43
- assert_1.default.strictEqual(editActions.edits.length, ranges.length);
46
+ assert_1.default.strictEqual(editActions.edits.length, ranges.length, `${editActions.edits.map((e) => (0, testStateUtils_1.convertFileEditActionToString)(e)).join('\n')} vs ${ranges
47
+ .map((r) => (0, testStateUtils_1.convertRangeToFileEditAction)(state, r, replacementText))
48
+ .map((e) => (0, testStateUtils_1.convertFileEditActionToString)(e))
49
+ .join('\n')}`);
44
50
  editActions.fileOperations.push({ kind: 'rename', oldFilePath: filePath, newFilePath });
45
51
  // Make sure we don't have missing imports on the original state.
46
52
  _verifyFileOperations(state, editActions, ranges, replacementText);
@@ -1 +1 @@
1
- {"version":3,"file":"renameModuleTestUtils.js","sourceRoot":"","sources":["../../../src/tests/renameModuleTestUtils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"renameModuleTestUtils.js","sourceRoot":"","sources":["../../../src/tests/renameModuleTestUtils.ts"],"names":[],"mappings":"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"}
@@ -3,6 +3,8 @@ import { FileEditAction, FileEditActions } from '../common/editAction';
3
3
  import { FileSystem } from '../common/fileSystem';
4
4
  import { Range } from './harness/fourslash/fourSlashTypes';
5
5
  import { TestState } from './harness/fourslash/testState';
6
+ export declare function convertFileEditActionToString(edit: FileEditAction): string;
7
+ export declare function convertRangeToFileEditAction(state: TestState, range: Range, replacementText?: string): FileEditAction;
6
8
  export declare function verifyEdits(state: TestState, fileEditActions: FileEditActions, ranges: Range[], replacementText: string | undefined): void;
7
9
  export declare function applyFileOperations(state: TestState, fileEditActions: FileEditActions): void;
8
10
  export declare function convertWorkspaceEditToFileEditActions(fs: FileSystem, edit: WorkspaceEdit): FileEditAction[];
@@ -10,24 +10,37 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
10
10
  return (mod && mod.__esModule) ? mod : { "default": mod };
11
11
  };
12
12
  Object.defineProperty(exports, "__esModule", { value: true });
13
- exports.convertWorkspaceEditToFileEditActions = exports.applyFileOperations = exports.verifyEdits = void 0;
13
+ exports.convertWorkspaceEditToFileEditActions = exports.applyFileOperations = exports.verifyEdits = exports.convertRangeToFileEditAction = exports.convertFileEditActionToString = void 0;
14
14
  const assert_1 = __importDefault(require("assert"));
15
15
  const collectionUtils_1 = require("../common/collectionUtils");
16
16
  const debug_1 = require("../common/debug");
17
17
  const pathUtils_1 = require("../common/pathUtils");
18
- const positionUtils_1 = require("../common/positionUtils");
18
+ const textEditUtils_1 = require("../common/textEditUtils");
19
19
  const textRange_1 = require("../common/textRange");
20
+ function convertFileEditActionToString(edit) {
21
+ return `'${edit.replacementText.replace(/\n/g, '!n!')}'@'${edit.filePath}:(${edit.range.start.line},${edit.range.start.character})-(${edit.range.end.line},${edit.range.end.character})'`;
22
+ }
23
+ exports.convertFileEditActionToString = convertFileEditActionToString;
24
+ function convertRangeToFileEditAction(state, range, replacementText) {
25
+ var _a, _b;
26
+ const data = (_a = range.marker) === null || _a === void 0 ? void 0 : _a.data;
27
+ return {
28
+ filePath: range.fileName,
29
+ replacementText: ((_b = replacementText !== null && replacementText !== void 0 ? replacementText : data === null || data === void 0 ? void 0 : data.r) !== null && _b !== void 0 ? _b : 'N/A').replace(/!n!/g, '\n'),
30
+ range: state.convertPositionRange(range),
31
+ };
32
+ }
33
+ exports.convertRangeToFileEditAction = convertRangeToFileEditAction;
20
34
  function verifyEdits(state, fileEditActions, ranges, replacementText) {
21
35
  for (const edit of fileEditActions.edits) {
22
- (0, assert_1.default)(ranges.some((r) => {
23
- var _a, _b;
24
- const data = (_a = r.marker) === null || _a === void 0 ? void 0 : _a.data;
25
- const expectedText = (_b = replacementText !== null && replacementText !== void 0 ? replacementText : data === null || data === void 0 ? void 0 : data.r) !== null && _b !== void 0 ? _b : 'N/A';
26
- const expectedRange = state.convertPositionRange(r);
27
- return (r.fileName === edit.filePath &&
28
- (0, textRange_1.rangesAreEqual)(expectedRange, edit.range) &&
29
- expectedText.replace(/!n!/g, '\n') === edit.replacementText);
30
- }), `can't find '${replacementText !== null && replacementText !== void 0 ? replacementText : edit.replacementText}'@'${edit.filePath}:(${edit.range.start.line},${edit.range.start.character})'`);
36
+ const expected = ranges.map((r) => convertRangeToFileEditAction(state, r, replacementText));
37
+ (0, assert_1.default)(expected.some((a) => {
38
+ return (a.filePath === edit.filePath &&
39
+ (0, textRange_1.rangesAreEqual)(a.range, edit.range) &&
40
+ a.replacementText === edit.replacementText);
41
+ }), `can't find ${convertFileEditActionToString(edit)} in ${expected
42
+ .map((a) => convertFileEditActionToString(a))
43
+ .join('|')}`);
31
44
  }
32
45
  }
33
46
  exports.verifyEdits = verifyEdits;
@@ -85,17 +98,7 @@ exports.applyFileOperations = applyFileOperations;
85
98
  function _applyEdits(state, filePath, edits) {
86
99
  const sourceFile = state.program.getBoundSourceFile(filePath);
87
100
  const parseResults = sourceFile.getParseResults();
88
- const editsWithOffset = edits
89
- .map((e) => ({
90
- range: (0, positionUtils_1.convertRangeToTextRange)(e.range, parseResults.tokenizerOutput.lines),
91
- text: e.replacementText,
92
- }))
93
- .sort((e1, e2) => e2.range.start - e1.range.start);
94
- // Apply change in reverse order.
95
- let current = parseResults.text;
96
- for (const change of editsWithOffset) {
97
- current = current.substr(0, change.range.start) + change.text + current.substr(textRange_1.TextRange.getEnd(change.range));
98
- }
101
+ const current = (0, textEditUtils_1.applyTextEditActions)(parseResults.text, edits.filter((e) => e.filePath === filePath), parseResults.tokenizerOutput.lines);
99
102
  return { version: sourceFile.getClientVersion(), text: current };
100
103
  }
101
104
  function convertWorkspaceEditToFileEditActions(fs, edit) {
@@ -1 +1 @@
1
- {"version":3,"file":"testStateUtils.js","sourceRoot":"","sources":["../../../src/tests/testStateUtils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"testStateUtils.js","sourceRoot":"","sources":["../../../src/tests/testStateUtils.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1 @@
1
+ export {};
@@ -0,0 +1,107 @@
1
+ "use strict";
2
+ /*
3
+ * textEditUtil.test.ts
4
+ * Copyright (c) Microsoft Corporation.
5
+ * Licensed under the MIT license.
6
+ */
7
+ var __importDefault = (this && this.__importDefault) || function (mod) {
8
+ return (mod && mod.__esModule) ? mod : { "default": mod };
9
+ };
10
+ Object.defineProperty(exports, "__esModule", { value: true });
11
+ const assert_1 = __importDefault(require("assert"));
12
+ const vscode_jsonrpc_1 = require("vscode-jsonrpc");
13
+ const editAction_1 = require("../common/editAction");
14
+ const textEditUtils_1 = require("../common/textEditUtils");
15
+ const testState_1 = require("./harness/fourslash/testState");
16
+ const testStateUtils_1 = require("./testStateUtils");
17
+ test('simple add', () => {
18
+ const code = `
19
+ //// import [|{|"r":"bar"|}foo|]
20
+ `;
21
+ verifyEdits(code);
22
+ });
23
+ test('multiple edits', () => {
24
+ const code = `
25
+ //// import [|{|"r":"bar"|}foo|][|{|"r":"!n!import os"|}|]
26
+ `;
27
+ verifyEdits(code);
28
+ });
29
+ test('delete and add', () => {
30
+ const code = `
31
+ //// [|{|"r":""|}import foo|][|{|"r":"import os"|}|]
32
+ `;
33
+ verifyEdits(code);
34
+ });
35
+ test('overlapped delete', () => {
36
+ const code = `
37
+ //// [|{|"e":""|}[|{|"r":""|}import [|{|"r":""|}foo|]|]|]
38
+ `;
39
+ verifyEdits(code);
40
+ });
41
+ test('overlapped delete and add', () => {
42
+ const code = `
43
+ //// [|{|"r":""|}import foo[|{|"r":"!n!import os"|}|]
44
+ //// |]
45
+ `;
46
+ verifyEdits(code);
47
+ });
48
+ test('dup with same range', () => {
49
+ const code = `
50
+ //// [|{|"e":"import os"|}[|{|"r":"import os"|}[|{|"r":"import os"|}import foo|]|]|]
51
+ `;
52
+ verifyEdits(code);
53
+ });
54
+ test('delete and add with merge', () => {
55
+ const code = `
56
+ //// [|{|"e":"import os"|}[|{|"r":""|}import foo|][|{|"r":"import os"|}|]|]
57
+ `;
58
+ verifyEdits(code, false);
59
+ });
60
+ test('overlapped delete with merge', () => {
61
+ const code = `
62
+ //// [|{|"e":""|}[|{|"r":""|}import [|{|"r":""|}foo|]|]|]
63
+ `;
64
+ verifyEdits(code, false);
65
+ });
66
+ test('overlapped delete and add with merge', () => {
67
+ const code = `
68
+ //// [|{|"e":"!n!import os"|}[|{|"r":""|}import foo[|{|"r":"!n!import os"|}|]
69
+ //// |]|]
70
+ `;
71
+ verifyEdits(code, false);
72
+ });
73
+ test('dup with overlapped range', () => {
74
+ const code = `
75
+ //// [|{|"e":"import os"|}[|{|"r":""|}import sys!n!|][|{|"r":"import os"|}[|{|"r":"import os"|}import foo|]|]|]
76
+ `;
77
+ verifyEdits(code, false);
78
+ });
79
+ function verifyEdits(code, mergeOnlyDuplications = true) {
80
+ const state = (0, testState_1.parseAndGetTestState)(code).state;
81
+ const tracker = new textEditUtils_1.TextEditTracker(mergeOnlyDuplications);
82
+ const ranges = state.getRanges();
83
+ const changeRanges = _getChangeRanges(ranges);
84
+ for (const range of changeRanges) {
85
+ const edit = (0, testStateUtils_1.convertRangeToFileEditAction)(state, range);
86
+ tracker.addEdit(edit.filePath, edit.range, edit.replacementText);
87
+ }
88
+ const edits = tracker.getEdits(vscode_jsonrpc_1.CancellationToken.None);
89
+ const editRanges = _getEditRanges(ranges);
90
+ assert_1.default.strictEqual(edits.length, editRanges.length);
91
+ (0, assert_1.default)(_areEqual(edits, editRanges.map((r) => _createFileActionEdit(state, r))));
92
+ }
93
+ function _getChangeRanges(ranges) {
94
+ return ranges.filter((r) => { var _a; return ((_a = r.marker) === null || _a === void 0 ? void 0 : _a.data) && r.marker.data.r !== undefined; });
95
+ }
96
+ function _getEditRanges(ranges) {
97
+ const editRanges = ranges.filter((r) => { var _a; return ((_a = r.marker) === null || _a === void 0 ? void 0 : _a.data) && r.marker.data.e !== undefined; });
98
+ return editRanges.length > 0 ? editRanges : _getChangeRanges(ranges);
99
+ }
100
+ function _areEqual(a1, a2) {
101
+ return a1.some((e1) => a2.some((e2) => editAction_1.FileEditAction.areEqual(e1, e2)));
102
+ }
103
+ function _createFileActionEdit(state, range) {
104
+ const replacementText = range.marker.data.e;
105
+ return (0, testStateUtils_1.convertRangeToFileEditAction)(state, range, replacementText);
106
+ }
107
+ //# sourceMappingURL=textEditUtil.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"textEditUtil.test.js","sourceRoot":"","sources":["../../../src/tests/textEditUtil.test.ts"],"names":[],"mappings":"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"}
@@ -998,6 +998,10 @@ test('Self6', () => {
998
998
  const analysisResults = TestUtils.typeAnalyzeSampleFiles(['self6.py']);
999
999
  TestUtils.validateResults(analysisResults, 0);
1000
1000
  });
1001
+ test('Self7', () => {
1002
+ const analysisResults = TestUtils.typeAnalyzeSampleFiles(['self7.py']);
1003
+ TestUtils.validateResults(analysisResults, 1);
1004
+ });
1001
1005
  test('UnusedVariable1', () => {
1002
1006
  const configOptions = new configOptions_1.ConfigOptions('.');
1003
1007
  configOptions.diagnosticRuleSet.reportUnusedVariable = 'none';