Skip to content

Commit

Permalink
fix: rename
Browse files Browse the repository at this point in the history
  • Loading branch information
0x706b committed Feb 5, 2023
1 parent 4b6f5e1 commit 3f72dc0
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 15 deletions.
15 changes: 15 additions & 0 deletions effect/packages/package1/src/rename-bug.ts
@@ -0,0 +1,15 @@
import { Effect } from "./prelude";

/**
* @tsplus type rename-bug/Ops
*/
export interface Ops {}

const Ops: Ops = {}

/**
* @tsplus static rename-bug/Ops succeed
*/
export const succeed = Effect.succeed

const succeed2 = Ops.succeed
31 changes: 16 additions & 15 deletions src/services/findAllReferences.ts
Expand Up @@ -243,6 +243,7 @@ import {
getTokenAtPosition,
isBinaryOperatorToken,
TsPlusExtensionTag,
isTsPlusSymbol,
} from "./_namespaces/ts";
import {
createImportTracker,
Expand Down Expand Up @@ -1024,26 +1025,26 @@ export namespace Core {
return moduleReferences;
}

// TSPLUS EXTENSION BEGIN

let tsPlusDeclarationReferences: SymbolAndEntries[] = []
if (symbol.valueDeclaration) {
for (const extension of checker.getExtensionsForDeclaration(symbol.valueDeclaration)) {
tsPlusDeclarationReferences = concatenate(
tsPlusDeclarationReferences,
getReferencedExtensionsForSymbol(symbol, extension, undefined, sourceFiles, sourceFilesSet, checker, cancellationToken, options)
);
}
}

// TSPLUS EXTENSION END

const aliasedSymbol = getMergedAliasedSymbolOfNamespaceExportDeclaration(node, symbol, checker);
const moduleReferencesOfExportTarget = aliasedSymbol &&
getReferencedSymbolsForModuleIfDeclaredBySourceFile(aliasedSymbol, program, sourceFiles, cancellationToken, options, sourceFilesSet);

const references = getReferencedSymbolsForSymbol(symbol, node, sourceFiles, sourceFilesSet, checker, cancellationToken, options);
return mergeReferences(program, moduleReferences, references, moduleReferencesOfExportTarget, tsPlusReferences, tsPlusDeclarationReferences);
// TSPLUS EXTENSION BEGIN
if (isTsPlusSymbol(symbol)) {
let tsPlusDeclarationReferences: SymbolAndEntries[] = []
if (symbol.valueDeclaration) {
for (const extension of checker.getExtensionsForDeclaration(symbol.valueDeclaration)) {
tsPlusDeclarationReferences = concatenate(
tsPlusDeclarationReferences,
getReferencedExtensionsForSymbol(symbol, extension, undefined, sourceFiles, sourceFilesSet, checker, cancellationToken, options)
);
}
}
return mergeReferences(program, moduleReferences, references, moduleReferencesOfExportTarget, tsPlusReferences, tsPlusDeclarationReferences);
}
// TSPLUS EXTENSION END
return mergeReferences(program, moduleReferences, references, moduleReferencesOfExportTarget);
}

export function getAdjustedNode(node: Node, options: Options) {
Expand Down

0 comments on commit 3f72dc0

Please sign in to comment.