Skip to content

Commit 7249412

Browse files
nicolas-guichardantonsviridov-src
authored andcommitted
Fix class name to not embed all packages
We want the symbol for a class to be package/package/Class#, instead this gave us `package/package/Class`#. Now we have just Class#, packages will be added back in a future commit. The display name should just be the simple class name. Still 23 failing tests.
1 parent bb5bf9a commit 7249412

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/SemanticdbTextDocumentBuilder.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ class SemanticdbTextDocumentBuilder(
199199
@OptIn(SymbolInternals::class)
200200
private fun displayName(firBasedSymbol: FirBasedSymbol<*>): String =
201201
when (firBasedSymbol) {
202-
is FirClassSymbol -> firBasedSymbol.classId.asSingleFqName().asString()
202+
is FirClassSymbol -> firBasedSymbol.classId.shortClassName.asString()
203203
is FirPropertyAccessorSymbol -> firBasedSymbol.fir.propertySymbol.name.asString()
204204
is FirFunctionSymbol -> firBasedSymbol.callableId.callableName.asString()
205205
is FirPropertySymbol -> firBasedSymbol.callableId.callableName.asString()

semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/SymbolsCache.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ class GlobalSymbolsCache(testing: Boolean = false) : Iterable<Symbol> {
139139
private fun semanticdbDescriptor(symbol: FirBasedSymbol<*>): SemanticdbSymbolDescriptor {
140140
return when {
141141
symbol is FirClassLikeSymbol ->
142-
SemanticdbSymbolDescriptor(Kind.TYPE, symbol.classId.asString())
142+
SemanticdbSymbolDescriptor(Kind.TYPE, symbol.classId.shortClassName.asString())
143143
symbol is FirPropertyAccessorSymbol &&
144144
symbol.fir.nameOrSpecialName.asStringStripSpecialMarkers().startsWith("set") ->
145145
SemanticdbSymbolDescriptor(

0 commit comments

Comments
 (0)