Handle named import clauses

Previously, lsif-typescript emitted an incorrect symbol for named import
clauses like `import React from 'react'`. Now, we handle this case
differently from anonymous import clauses such as `import { React } from 'react'`

Author: olafurpg

snapshots/input/.gitignore

@@ -0,0 +1,3 @@
+package-lock.json
+yarn.lock
+dump.svg

snapshots/input/react/package.json

@@ -0,0 +1,21 @@
+{
+  "name": "example",
+  "version": "1.0.0",
+  "description": "Example TS/JS project",
+  "main": "src/main.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "",
+  "workspaces": [
+    "packages/*"
+  ],
+  "license": "ISC",
+  "private": true,
+  "dependencies": {
+    "react": "16.4.0"
+  },
+  "devDependencies": {
+    "@types/react": "17.0.0"
+  }
+}

snapshots/input/react/src/LoaderInput.tsx

@@ -0,0 +1,15 @@
+import React from 'react'
+
+/** Takes loading prop, input component as child */
+interface Props {
+    loading: boolean
+    children: React.ReactNode
+    className?: string
+}
+
+export const LoaderInput: React.FunctionComponent<Props> = ({ loading, children, className }) => (
+    <div className="hello">
+        {children}
+        {loading && <p className="spinner">spinner</p>}
+    </div>
+)

snapshots/input/react/tsconfig.json

@@ -0,0 +1,7 @@
+{
+  "compilerOptions": {
+    "jsx": "react",
+    "esModuleInterop": true,
+    "outDir": "dist"
+  }
+}

snapshots/output/react/src/LoaderInput.tsx

@@ -0,0 +1,38 @@
+  import React from 'react'
+//       ^^^^^ reference @types/react 17.0.0 `index.d.ts`/React/
+  
+  /** Takes loading prop, input component as child */
+  interface Props {
+//          ^^^^^ definition example 1.0.0 src/`LoaderInput.tsx`/Props#
+      loading: boolean
+//    ^^^^^^^ definition example 1.0.0 src/`LoaderInput.tsx`/Props#loading.
+      children: React.ReactNode
+//    ^^^^^^^^ definition example 1.0.0 src/`LoaderInput.tsx`/Props#children.
+//              ^^^^^ reference @types/react 17.0.0 `index.d.ts`/React/
+//                    ^^^^^^^^^ reference local 0
+      className?: string
+//    ^^^^^^^^^ definition example 1.0.0 src/`LoaderInput.tsx`/Props#className.
+  }
+  
+  export const LoaderInput: React.FunctionComponent<Props> = ({ loading, children, className }) => (
+//             ^^^^^^^^^^^ definition example 1.0.0 src/`LoaderInput.tsx`/LoaderInput.
+//                          ^^^^^ reference @types/react 17.0.0 `index.d.ts`/React/
+//                                ^^^^^^^^^^^^^^^^^ reference @types/react 17.0.0 `index.d.ts`/React/FunctionComponent#
+//                                                  ^^^^^ reference example 1.0.0 src/`LoaderInput.tsx`/Props#
+//                                                              ^^^^^^^ reference local 4
+//                                                                       ^^^^^^^^ reference local 5
+//                                                                                 ^^^^^^^^^ reference local 6
+      <div className="hello">
+//     ^^^ reference @types/react 17.0.0 `index.d.ts`/global/JSX/IntrinsicElements#div.
+//         ^^^^^^^^^ reference local 11
+          {children}
+//         ^^^^^^^^ reference local 5
+          {loading && <p className="spinner">spinner</p>}
+//         ^^^^^^^ reference local 4
+//                     ^ reference @types/react 17.0.0 `index.d.ts`/global/JSX/IntrinsicElements#p.
+//                       ^^^^^^^^^ reference local 17
+//                                                    ^ reference @types/react 17.0.0 `index.d.ts`/global/JSX/IntrinsicElements#p.
+      </div>
+//      ^^^ reference @types/react 17.0.0 `index.d.ts`/global/JSX/IntrinsicElements#div.
+  )
+  

src/FileIndexer.ts

@@ -189,7 +189,8 @@ export class FileIndexer {
     if (isAnonymousContainerOfSymbols(node)) {
       return this.cached(node, this.lsifSymbol(node.parent))
     }
-    if (ts.isImportSpecifier(node)) {
+
+    if (ts.isImportSpecifier(node) || ts.isImportClause(node)) {
       const tpe = this.checker.getTypeAtLocation(node)
       for (const declaration of tpe.symbol?.declarations || []) {
         return this.lsifSymbol(declaration)
@@ -265,7 +266,7 @@ function isAnonymousContainerOfSymbols(node: ts.Node): boolean {
   return (
     ts.isModuleBlock(node) ||
     ts.isImportDeclaration(node) ||
-    ts.isImportClause(node) ||
+    (ts.isImportClause(node) && !node.name) ||
     ts.isNamedImports(node) ||
     ts.isVariableStatement(node) ||
     ts.isVariableDeclarationList(node)

src/main.test.ts

@@ -26,10 +26,13 @@ if (isUpdate && fs.existsSync(outputDirectory)) {
   fs.rmSync(outputDirectory, { recursive: true })
 }
 for (const snapshotDirectory of snapshotDirectories) {
+  const inputRoot = join(inputDirectory, snapshotDirectory)
+  const outputRoot = join(outputDirectory, snapshotDirectory)
+  if (!fs.statSync(inputRoot).isDirectory()) {
+    continue
+  }
   test(snapshotDirectory, () => {
     const index = new lsif.lib.codeintel.lsiftyped.Index()
-    const inputRoot = join(inputDirectory, snapshotDirectory)
-    const outputRoot = join(outputDirectory, snapshotDirectory)
     lsifIndex({
       workspaceRoot: inputRoot,
       projectRoot: inputRoot,
@@ -42,6 +45,7 @@ for (const snapshotDirectory of snapshotDirectories) {
         }
       },
     })
+    fs.mkdirSync(outputRoot, { recursive: true })
     fs.writeFileSync(
       path.join(outputRoot, 'dump.lsif-typed'),
       index.serializeBinary()