fix: go to definition

ts-plus · Feb 5, 2023 · 533d6ff · 533d6ff
1 parent 131e7fb
commit 533d6ff
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 41 deletions.
diff --git a/effect/packages/package1/src/rename-bug.ts b/effect/packages/package1/src/rename-bug.ts
@@ -12,4 +12,6 @@ const Ops: Ops = {}
  */
 export const succeed = Effect.succeed
 
-const succeed2 = Ops.succeed
+const succeed2 = Ops.succeed
+
+Effect.succeed(1).flatMap((x) => Effect(1))
diff --git a/src/services/goToDefinition.ts b/src/services/goToDefinition.ts
@@ -169,54 +169,57 @@ export function getDefinitionAtPosition(program: Program, sourceFile: SourceFile
     let symbol: Symbol | undefined;
     let failedAliasResolution: boolean | undefined;
 
-    if (isPropertyAccessExpression(parent)) {
-        const nodeType = typeChecker.getTypeAtLocation(node);
-        if(nodeType.symbol && isTsPlusSymbol(nodeType.symbol)) {
-            if (parent.parent && isCallExpression(parent.parent) && parent.parent.expression === parent) {
-                const declaration = getDeclarationForTsPlus(typeChecker, parent.parent, nodeType.symbol)
-                if (declaration) {
-                    symbol = declaration.symbol
+    const nodeSymbol = typeChecker.getSymbolAtLocation(node)
+    if (!nodeSymbol) {
+        if (isPropertyAccessExpression(parent)) {
+            const nodeType = typeChecker.getTypeAtLocation(node);
+            if(nodeType.symbol && isTsPlusSymbol(nodeType.symbol)) {
+                if (parent.parent && isCallExpression(parent.parent) && parent.parent.expression === parent) {
+                    const declaration = getDeclarationForTsPlus(typeChecker, parent.parent, nodeType.symbol)
+                    if (declaration) {
+                        symbol = declaration.symbol
+                    }
+                }
+                if (!symbol && nodeType.symbol.tsPlusTag !== TsPlusSymbolTag.Fluent) {
+                    symbol = nodeType.symbol.tsPlusDeclaration.symbol;
                 }
             }
-            if (!symbol && nodeType.symbol.tsPlusTag !== TsPlusSymbolTag.Fluent) {
-                symbol = nodeType.symbol.tsPlusDeclaration.symbol;
+            else if (isTsPlusTypeWithDeclaration(nodeType)) {
+                symbol = nodeType.tsPlusSymbol.tsPlusDeclaration.symbol;
             }
-        }
-        else if (isTsPlusTypeWithDeclaration(nodeType)) {
-            symbol = nodeType.tsPlusSymbol.tsPlusDeclaration.symbol;
-        }
-        else {
-            const type = typeChecker.getTypeAtLocation(parent.expression);
-            const extensions = typeChecker.getExtensions(parent.expression);
-
-            if(extensions) {
-                const name = parent.name.escapedText.toString();
-                const staticValueSymbol = typeChecker.getStaticExtension(type, name);
-                if(staticValueSymbol) {
-                    // If execution gets here, it means we have a static variable extension,
-                    // which needs to be treated a little differently
-                    const declaration = staticValueSymbol.patched.valueDeclaration;
-                    if(declaration && declaration.original) {
-                        symbol = (declaration.original as Declaration).symbol;
+            else {
+                const type = typeChecker.getTypeAtLocation(parent.expression);
+                const extensions = typeChecker.getExtensions(parent.expression);
+
+                if(extensions) {
+                    const name = parent.name.escapedText.toString();
+                    const staticValueSymbol = typeChecker.getStaticExtension(type, name);
+                    if(staticValueSymbol) {
+                        // If execution gets here, it means we have a static variable extension,
+                        // which needs to be treated a little differently
+                        const declaration = staticValueSymbol.patched.valueDeclaration;
+                        if(declaration && declaration.original) {
+                            symbol = (declaration.original as Declaration).symbol;
+                        }
+                    } else {
+                        symbol = extensions.get(name);
                     }
-                } else {
-                    symbol = extensions.get(name);
                 }
             }
-        }
 
-        if (!symbol) {
-            symbol = typeChecker.getNodeLinks(node.parent).tsPlusSymbol
-        }
-    }
-    else if (isBinaryOperatorToken(node) && isBinaryExpression(parent)) {
-        const extension = typeChecker.getResolvedOperator(parent);
-        if (extension && extension.declaration) {
-            if (isTsPlusSymbol(extension.declaration.symbol) && extension.declaration.symbol.tsPlusTag === TsPlusSymbolTag.PipeableDeclaration) {
-                symbol = extension.declaration.symbol.tsPlusDeclaration.symbol
+            if (!symbol) {
+                symbol = typeChecker.getNodeLinks(node.parent).tsPlusSymbol
             }
-            else {
-                symbol = extension.declaration.symbol;
+        }
+        else if (isBinaryOperatorToken(node) && isBinaryExpression(parent)) {
+            const extension = typeChecker.getResolvedOperator(parent);
+            if (extension && extension.declaration) {
+                if (isTsPlusSymbol(extension.declaration.symbol) && extension.declaration.symbol.tsPlusTag === TsPlusSymbolTag.PipeableDeclaration) {
+                    symbol = extension.declaration.symbol.tsPlusDeclaration.symbol
+                }
+                else {
+                    symbol = extension.declaration.symbol;
+                }
             }
         }
     }