inline

Author: jakebailey

internal/ast/ast.go

@@ -10950,58 +10950,55 @@ func (node *SourceFile) ECMALineMap() []core.TextPos {
 // If the name appears more than once, the value is -1.
 func (file *SourceFile) GetNameTable() map[string]int {
 	file.nameTableOnce.Do(func() {
-		file.nameTable = file.initializeNameTable()
-	})
-	return file.nameTable
-}
+		nameTable := make(map[string]int)
 
-func (file *SourceFile) initializeNameTable() map[string]int {
-	nameTable := make(map[string]int)
+		isTagName := func(node *Node) bool {
+			return node.Parent != nil && IsJSDocTag(node.Parent) && node.Parent.TagName() == node
+		}
 
-	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
+		}
 
-	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)
+		}
 
-	// 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() != "" ||
+				IsStringOrNumericLiteralLike(node) && literalIsName(node) ||
+				IsPrivateIdentifier(node) {
+				text := node.Text()
+				if _, ok := nameTable[text]; ok {
+					nameTable[text] = -1
+				} else {
+					nameTable[text] = node.Pos()
+				}
+			}
 
-	var walk func(node *Node) bool
-	walk = func(node *Node) bool {
-		if IsIdentifier(node) && !isTagName(node) && node.Text() != "" ||
-			IsStringOrNumericLiteralLike(node) && literalIsName(node) ||
-			IsPrivateIdentifier(node) {
-			text := node.Text()
-			if _, ok := nameTable[text]; ok {
-				nameTable[text] = -1
-			} else {
-				nameTable[text] = node.Pos()
+			node.ForEachChild(walk)
+			jsdocNodes := node.JSDoc(file)
+			for _, jsdoc := range jsdocNodes {
+				jsdoc.ForEachChild(walk)
 			}
+			return false
 		}
 
-		node.ForEachChild(walk)
-		jsdocNodes := node.JSDoc(file)
-		for _, jsdoc := range jsdocNodes {
-			jsdoc.ForEachChild(walk)
-		}
-		return false
-	}
+		file.AsNode().ForEachChild(walk)
 
-	file.AsNode().ForEachChild(walk)
-	return nameTable
+		file.nameTable = nameTable
+	})
+	return file.nameTable
 }
 
 func (node *SourceFile) IsBound() bool {