Commit ec4e302

author

Lorenz Bateman

committed

Fallback to declaration text range

Not all named declarations have a name identifier. In those cases fallback to using the range that encloses the whole named declaration rather than returning nothing.

1 parent 4056a8b commit ec4e302Copy full SHA for ec4e302

File tree

1 file changed

+14

-12

lines changed

server/src/main/kotlin/org/javacs/kt/symbols
- Symbols.kt

1 file changed

+14

-12

lines changed

`‎server/src/main/kotlin/org/javacs/kt/symbols/Symbols.kt‎`

Lines changed: 14 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,9 @@ import org.eclipse.lsp4j.WorkspaceSymbolLocation`
`12`	`12`	`import org.eclipse.lsp4j.jsonrpc.messages.Either`
`13`	`13`	`import org.javacs.kt.SourcePath`
`14`	`14`	`import org.javacs.kt.position.range`
	`15`	`+import org.javacs.kt.position.toURIString`
`15`	`16`	`import org.javacs.kt.util.containsCharactersInOrder`
`16`	`17`	`import org.javacs.kt.util.preOrderTraversal`
`17`		`-import org.javacs.kt.util.toPath`
`18`	`18`	`import org.jetbrains.kotlin.psi.*`
`19`	`19`	`import org.jetbrains.kotlin.psi.psiUtil.parents`
`20`	`20`
`@@ -82,20 +82,22 @@ private fun symbolKind(d: KtNamedDeclaration): SymbolKind =`
`82`	`82`	`else -> throw IllegalArgumentException("Unexpected symbol $d")`
`83`	`83`	`}`
`84`	`84`
`85`		`-private fun location(d: KtNamedDeclaration): Location? {`
`86`		`- val uri = d.containingFile.toPath().toUri().toString()`
`87`		`- val (content, textRange) = try { d.containingFile?.text to d.nameIdentifier?.textRange } catch (e: Exception) { null to null }`
`88`		`- return if (content != null && textRange != null) {`
`89`		`- Location(uri, range(content, textRange))`
`90`		`- } else {`
	`85`	`+private fun location(d: KtNamedDeclaration): Location? =`
	`86`	`+ try {`
	`87`	`+ val content = d.containingFile?.text`
	`88`	`+ val locationInContent = (d.nameIdentifier?.textRange ?: d.textRange)`
	`89`	`+ if (content != null && locationInContent != null) {`
	`90`	`+ Location(d.containingFile.toURIString(), range(content, locationInContent))`
	`91`	`+ } else {`
	`92`	`+ null`
	`93`	`+ }`
	`94`	`+ } catch (e: Exception) {`
`91`	`95`	`null`
`92`	`96`	`}`
`93`		`-}`
`94`	`97`
`95`		`-private fun workspaceSymbolLocation(d: KtNamedDeclaration): WorkspaceSymbolLocation {`
`96`		`- val uri = d.containingFile.toPath().toUri().toString()`
`97`		`- return WorkspaceSymbolLocation(uri)`
`98`		`-}`
	`98`	`+`
	`99`	`+private fun workspaceSymbolLocation(d: KtNamedDeclaration): WorkspaceSymbolLocation =`
	`100`	`+ WorkspaceSymbolLocation(d.containingFile.toURIString())`
`99`	`101`
`100`	`102`	`private fun symbolContainer(d: KtNamedDeclaration): String? =`
`101`	`103`	`d.parents`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit ec4e302

File tree

1 file changed

1 file changed

`‎server/src/main/kotlin/org/javacs/kt/symbols/Symbols.kt‎`

0 commit comments