Skip to content

Commit

Permalink
fix merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
Kingwl committed Jul 23, 2020
1 parent 7617bb3 commit 5a937eb
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions src/services/findAllReferences.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1915,9 +1915,6 @@ namespace ts.FindAllReferences {
function populateSearchSymbolSet(symbol: Symbol, location: Node, checker: TypeChecker, isForRename: boolean, providePrefixAndSuffixText: boolean, implementations: boolean): Symbol[] {
const result: Symbol[] = [];
forEachRelatedSymbol<void>(symbol, location, checker, isForRename, !(isForRename && providePrefixAndSuffixText),
<<<<<<< HEAD
(sym, root, base) => { result.push(base || root || sym); },
=======
(sym, root, base) => {
// static method/property and instance method/property might have the same name. Only include static or only include instance.
if (base) {
Expand All @@ -1928,7 +1925,6 @@ namespace ts.FindAllReferences {
result.push(base || root || sym);
},
// when try to find implementation, implementations is true, and not allowed to find base class
>>>>>>> master
/*allowBaseTypes*/() => !implementations);
return result;
}
Expand Down

0 comments on commit 5a937eb

Please sign in to comment.