Use textRangeContainsPositionInclusive

MariaSolOs · MariaSolOs · commit baec3fd9c01b · 2023-06-07T16:44:53.000-05:00
diff --git a/src/services/refactors/inlineVariable.ts b/src/services/refactors/inlineVariable.ts
@@ -27,6 +27,7 @@ import {
     SourceFile,
     SymbolFlags,
     textChanges,
+    textRangeContainsPositionInclusive,
     TypeChecker,
     VariableDeclaration,
 } from "../_namespaces/ts";
@@ -168,7 +169,7 @@ function getReferenceNodes(declaration: InitializedVariableDeclaration, checker:
         }
 
         // Cannot inline recursive declarations (e.g. const foo = () => foo();)
-        if (findAncestor(ref, node => node === declaration.initializer)) {
+        if (textRangeContainsPositionInclusive(declaration, ref.pos)) {
             return true;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ import {`
`27`	`27`	`SourceFile,`
`28`	`28`	`SymbolFlags,`
`29`	`29`	`textChanges,`
	`30`	`+ textRangeContainsPositionInclusive,`
`30`	`31`	`TypeChecker,`
`31`	`32`	`VariableDeclaration,`
`32`	`33`	`} from "../_namespaces/ts";`
`@@ -168,7 +169,7 @@ function getReferenceNodes(declaration: InitializedVariableDeclaration, checker:`
`168`	`169`	`}`
`169`	`170`
`170`	`171`	`// Cannot inline recursive declarations (e.g. const foo = () => foo();)`
`171`		`- if (findAncestor(ref, node => node === declaration.initializer)) {`
	`172`	`+ if (textRangeContainsPositionInclusive(declaration, ref.pos)) {`
`172`	`173`	`return true;`
`173`	`174`	`}`
`174`	`175`