Move around

Author: jakebailey

internal/ast/ast.go

@@ -10952,27 +10952,6 @@ func (file *SourceFile) GetNameTable() map[string]int {
 	file.nameTableOnce.Do(func() {
 		nameTable := make(map[string]int, file.IdentifierCount)
 
-		isTagName := func(node *Node) bool {
-			return node.Parent != nil && IsJSDocTag(node.Parent) && node.Parent.TagName() == node
-		}
-
-		isArgumentOfElementAccessExpression := func(node *Node) bool {
-			return node != nil && node.Parent != nil &&
-				node.Parent.Kind == KindElementAccessExpression &&
-				node.Parent.AsElementAccessExpression().ArgumentExpression == node
-		}
-
-		// We want to store any numbers/strings if they were a name that could be
-		// related to a declaration.  So, if we have 'import x = require("something")'
-		// then we want 'something' to be in the name table.  Similarly, if we have
-		// "a['propname']" then we want to store "propname" in the name table.
-		literalIsName := func(node *Node) bool {
-			return IsDeclarationName(node) ||
-				node.Parent.Kind == KindExternalModuleReference ||
-				isArgumentOfElementAccessExpression(node) ||
-				IsLiteralComputedPropertyDeclarationName(node)
-		}
-
 		var walk func(node *Node) bool
 		walk = func(node *Node) bool {
 			if IsIdentifier(node) && !isTagName(node) && node.Text() != "" ||
@@ -10993,8 +10972,7 @@ func (file *SourceFile) GetNameTable() map[string]int {
 			}
 			return false
 		}
-
-		file.AsNode().ForEachChild(walk)
+		file.ForEachChild(walk)
 
 		file.nameTable = nameTable
 	})

internal/ast/utilities.go

@@ -4159,3 +4159,24 @@ func GetRestParameterElementType(node *ParameterDeclarationNode) *Node {
 	}
 	return nil
 }
+
+func isTagName(node *Node) bool {
+	return node.Parent != nil && IsJSDocTag(node.Parent) && node.Parent.TagName() == node
+}
+
+// We want to store any numbers/strings if they were a name that could be
+// related to a declaration.  So, if we have 'import x = require("something")'
+// then we want 'something' to be in the name table.  Similarly, if we have
+// "a['propname']" then we want to store "propname" in the name table.
+func literalIsName(node *Node) bool {
+	return IsDeclarationName(node) ||
+		node.Parent.Kind == KindExternalModuleReference ||
+		isArgumentOfElementAccessExpression(node) ||
+		IsLiteralComputedPropertyDeclarationName(node)
+}
+
+func isArgumentOfElementAccessExpression(node *Node) bool {
+	return node != nil && node.Parent != nil &&
+		node.Parent.Kind == KindElementAccessExpression &&
+		node.Parent.AsElementAccessExpression().ArgumentExpression == node
+}

internal/ls/utilities.go

@@ -483,11 +483,6 @@ func isObjectBindingElementWithoutPropertyName(bindingElement *ast.Node) bool {
 		bindingElement.PropertyName() == nil
 }
 
-func isArgumentOfElementAccessExpression(node *ast.Node) bool {
-	return node != nil && node.Parent != nil &&
-		node.Parent.Kind == ast.KindElementAccessExpression &&
-		node.Parent.AsElementAccessExpression().ArgumentExpression == node
-}
 
 func isRightSideOfPropertyAccess(node *ast.Node) bool {
 	return node.Parent.Kind == ast.KindPropertyAccessExpression && node.Parent.Name() == node