Move getNodeAtPosition back

andrewbranch · andrewbranch · commit 76220f397add · 2021-02-03T15:54:35.000-08:00
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
@@ -2355,6 +2355,22 @@ namespace ts {
                 }
             }
 
+            /** Returns a token if position is in [start-of-leading-trivia, end), includes JSDoc only in JS files */
+            function getNodeAtPosition(sourceFile: SourceFile, position: number): Node {
+                let current: Node = sourceFile;
+                const getContainingChild = (child: Node) => {
+                    if (child.pos <= position && (position < child.end || (position === child.end && (child.kind === SyntaxKind.EndOfFileToken)))) {
+                        return child;
+                    }
+                };
+                while (true) {
+                    const child = isSourceFileJS(sourceFile) && hasJSDocNodes(current) && forEach(current.jsDoc, getContainingChild) || forEachChild(current, getContainingChild);
+                    if (!child) {
+                        return current;
+                    }
+                    current = child;
+                }
+            }
         }
 
         function getLibFileFromReference(ref: FileReference) {
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
@@ -7119,23 +7119,6 @@ namespace ts {
         }
     }
 
-    /** Returns a token if position is in [start-of-leading-trivia, end), includes JSDoc only in JS files */
-    export function getNodeAtPosition(sourceFile: SourceFile, position: number): Node {
-        let current: Node = sourceFile;
-        const getContainingChild = (child: Node) => {
-            if (child.pos <= position && (position < child.end || (position === child.end && (child.kind === SyntaxKind.EndOfFileToken)))) {
-                return child;
-            }
-        };
-        while (true) {
-            const child = isSourceFileJS(sourceFile) && hasJSDocNodes(current) && forEach(current.jsDoc, getContainingChild) || forEachChild(current, getContainingChild);
-            if (!child) {
-                return current;
-            }
-            current = child;
-        }
-    }
-
     export function nodeIsFirstNodeAtOrAfterPosition(sourceFile: SourceFile, node: Node, position: number): boolean {
         if (node.pos === position) return true;
         if (node.pos < position) return false;
