Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions docs/configurations/ty.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,14 @@ language server setting.
Default: `true`


## Go to definition

Whether PyCharm's <i>Go to Declaration</i>
and related features should defer to ty.

Default: `true`


## Log level

The amount of logs the language server will emit.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ internal class TYConfigurations : DisplayableState(), Copyable {
var completions by property(true)
var completionsAutoImport by property(true)

var goToDefinition by property(true)

var logLevel by enum(LogLevel.INFO)
var logFile by string(null)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,10 @@ private fun Row.completionsAutoImportInput(block: Cell<JBCheckBox>.() -> Unit) =
checkBox(message("configurations.ty.completionsAutoImport.label")).apply(block)


private fun Row.goToDefinitionInput(block: Cell<JBCheckBox>.() -> Unit) =
checkBox(message("configurations.ty.goToDefinition.label")).apply(block)


private fun Row.logLevelInput(block: Cell<ComboBox<LogLevel>>.() -> Unit) =
comboBox<LogLevel>().apply(block)

Expand Down Expand Up @@ -165,6 +169,11 @@ private fun TYPanel.makeComponent() = panel {
}
}

row {
goToDefinitionInput { bindSelected(state::goToDefinition) }
overrideCheckbox(state::goToDefinition)
}

separator()

row(message("configurations.ty.logLevel.label")) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package insyncwithfoo.ryecharm.ty.lsp

import com.intellij.platform.lsp.api.customization.LspGoToDefinitionSupport


internal class GoToDefinitionSupport : LspGoToDefinitionSupport()
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ import com.intellij.platform.lsp.api.customization.LspCompletionDisabled
import com.intellij.platform.lsp.api.customization.LspCustomization
import com.intellij.platform.lsp.api.customization.LspDiagnosticsCustomizer
import com.intellij.platform.lsp.api.customization.LspDiagnosticsDisabled
import com.intellij.platform.lsp.api.customization.LspGoToDefinitionCustomizer
import com.intellij.platform.lsp.api.customization.LspGoToDefinitionDisabled
import com.intellij.platform.lsp.api.customization.LspInlayHintCustomizer
import com.intellij.platform.lsp.api.customization.LspInlayHintDisabled
import insyncwithfoo.ryecharm.common.logging.tyLogger
Expand Down Expand Up @@ -50,6 +52,12 @@ internal class TYServerDescriptor(project: Project, private val executable: Path
else -> LspCompletionDisabled
}

override val goToDefinitionCustomizer: LspGoToDefinitionCustomizer
get() = when (configurations.goToDefinition) {
true -> GoToDefinitionSupport()
else -> LspGoToDefinitionDisabled
}

}

override val clientCapabilities: ClientCapabilities
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/messages/ryecharm.properties
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,8 @@ configurations.ty.inlayHintsCallArgumentNames.label = Call argument names
configurations.ty.completions.label = Completions
configurations.ty.completionsAutoImport.label = Auto-import

configurations.ty.goToDefinition.label = Go to definition

configurations.ty.logLevel.label = Log level:
configurations.ty.logLevel.trace = Trace
configurations.ty.logLevel.debug = Debug
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ internal class TYConfigurationsTest : ConfigurationsTest<TYConfigurations>() {

@Test
fun `test shape`() {
doShapeTest(expectedSize = 14) {
doShapeTest(expectedSize = 15) {
assertEquals(null, executable)
assertEquals(null, configurationFile)

Expand All @@ -31,6 +31,8 @@ internal class TYConfigurationsTest : ConfigurationsTest<TYConfigurations>() {
assertEquals(true, completions)
assertEquals(true, completionsAutoImport)

assertEquals(true, goToDefinition)

assertEquals(LogLevel.INFO, logLevel)
assertEquals(null, logFile)
}
Expand Down
Loading