Skip to content

Commit 84a3ea8

Browse files
committed
fix tooltip, inlayhints things
1 parent 173a2eb commit 84a3ea8

File tree

5 files changed

+582
-9
lines changed

5 files changed

+582
-9
lines changed

src/cm/commandRegistry.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,16 +70,16 @@ import {
7070
jumpToDefinition as lspJumpToDefinition,
7171
jumpToImplementation as lspJumpToImplementation,
7272
jumpToTypeDefinition as lspJumpToTypeDefinition,
73-
nextSignature as lspNextSignature,
74-
prevSignature as lspPrevSignature,
75-
showSignatureHelp as lspShowSignatureHelp,
7673
} from "@codemirror/lsp-client";
7774
import { Compartment, EditorSelection } from "@codemirror/state";
7875
import { keymap } from "@codemirror/view";
7976
import {
8077
renameSymbol as acodeRenameSymbol,
8178
clearDiagnosticsEffect,
8279
clientManager,
80+
nextSignature as lspNextSignature,
81+
prevSignature as lspPrevSignature,
82+
showSignatureHelp as lspShowSignatureHelp,
8383
} from "cm/lsp";
8484
import {
8585
closeReferencesPanel as acodeCloseReferencesPanel,

src/cm/lsp/clientManager.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@ import type { LSPClientExtension } from "@codemirror/lsp-client";
33
import {
44
findReferencesKeymap,
55
formatKeymap,
6-
hoverTooltips,
76
jumpToDefinitionKeymap,
87
LSPClient,
98
LSPPlugin,
109
serverCompletion,
1110
serverDiagnostics,
12-
signatureHelp,
1311
} from "@codemirror/lsp-client";
1412
import { EditorState, Extension, MapMode } from "@codemirror/state";
1513
import { EditorView, keymap } from "@codemirror/view";
@@ -23,6 +21,7 @@ import { inlayHintsExtension } from "./inlayHints";
2321
import { acodeRenameKeymap } from "./rename";
2422
import { ensureServerRunning } from "./serverLauncher";
2523
import serverRegistry from "./serverRegistry";
24+
import { hoverTooltips, signatureHelp } from "./tooltipExtensions";
2625
import { createTransport } from "./transport";
2726
import type {
2827
BuiltinExtensionsConfig,
@@ -149,7 +148,7 @@ function buildBuiltinExtensions(
149148
signature: includeSignature = true,
150149
keymaps: includeKeymaps = true,
151150
diagnostics: includeDiagnostics = true,
152-
inlayHints: includeInlayHints = true,
151+
inlayHints: includeInlayHints = false,
153152
documentHighlights: includeDocumentHighlights = true,
154153
formatting: includeFormatting = true,
155154
} = config;
@@ -519,7 +518,7 @@ export class LspClientManager {
519518
signature: builtinConfig.signature !== false,
520519
keymaps: builtinConfig.keymaps !== false,
521520
diagnostics: builtinConfig.diagnostics !== false,
522-
inlayHints: builtinConfig.inlayHints !== false,
521+
inlayHints: builtinConfig.inlayHints === true,
523522
documentHighlights: builtinConfig.documentHighlights !== false,
524523
formatting: builtinConfig.formatting !== false,
525524
})

src/cm/lsp/index.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,11 @@ export {
7272
stopManagedServer,
7373
} from "./serverLauncher";
7474
export { default as serverRegistry } from "./serverRegistry";
75+
export {
76+
nextSignature,
77+
prevSignature,
78+
showSignatureHelp,
79+
} from "./tooltipExtensions";
7580
export { createTransport } from "./transport";
7681

7782
export type {

0 commit comments

Comments
 (0)