Small simplifications in LSP extensions

This commit is contained in:
Marijn Haverbeke
2025-05-05 11:00:45 +02:00
parent 39f512d32d
commit 9265af9115
4 changed files with 6 additions and 39 deletions

View File

@ -15,10 +15,6 @@ export default function lspGoToDefinitionExt(
{
key: 'F12',
run: (view) => {
if (!plugin) {
return false
}
const value = view.plugin(plugin)
if (!value) return false

View File

@ -1034,15 +1034,8 @@ export class LanguageServerPlugin implements PluginValue {
continue
}
// Sort edits in reverse order to avoid position shifts
const sortedEdits = docChange.edits.sort((a, b) => {
const posA = posToOffset(view.state.doc, a.range.start)
const posB = posToOffset(view.state.doc, b.range.start)
return (posB ?? 0) - (posA ?? 0)
})
// Create a single transaction with all changes
const changes = sortedEdits.map((edit) => ({
const changes = docChange.edits.map((edit) => ({
from: posToOffset(view.state.doc, edit.range.start) ?? 0,
to: posToOffset(view.state.doc, edit.range.end) ?? 0,
insert: edit.newText,
@ -1070,15 +1063,8 @@ export class LanguageServerPlugin implements PluginValue {
continue
}
// Sort changes in reverse order to avoid position shifts
const sortedChanges = changes.sort((a, b) => {
const posA = posToOffset(view.state.doc, a.range.start)
const posB = posToOffset(view.state.doc, b.range.start)
return (posB ?? 0) - (posA ?? 0)
})
// Create a single transaction with all changes
const changeSpecs = sortedChanges.map((change) => ({
const changeSpecs = changes.map((change) => ({
from: posToOffset(view.state.doc, change.range.start) ?? 0,
to: posToOffset(view.state.doc, change.range.end) ?? 0,
insert: change.newText,

View File

@ -15,8 +15,6 @@ export default function lspRenameExt(
{
key: 'F2',
run: (view) => {
if (!plugin) return false
const value = view.plugin(plugin)
if (!value) return false

View File

@ -15,10 +15,6 @@ export default function lspSignatureHelpExt(
{
key: 'Mod-Shift-Space',
run: (view) => {
if (!plugin) {
return false
}
const value = view.plugin(plugin)
if (!value) return false
@ -32,17 +28,10 @@ export default function lspSignatureHelpExt(
),
// eslint-disable-next-line @typescript-eslint/no-misused-promises
EditorView.updateListener.of(async (update) => {
if (!(plugin && update.docChanged)) return
if (!update.docChanged) return
// Make sure this is a valid user typing event.
let isRelevant = false
for (const tr of update.transactions) {
if (tr.isUserEvent('input')) {
isRelevant = true
}
}
if (!isRelevant) {
if (!update.transactions.some((tr) => tr.isUserEvent('input'))) {
// We only want signature help on user events.
return
}
@ -59,18 +48,16 @@ export default function lspSignatureHelpExt(
// Check if changes include trigger characters
const changes = update.changes
let shouldTrigger = false
let triggerPos = -1
changes.iterChanges((_fromA, _toA, _fromB, toB, inserted) => {
if (shouldTrigger) return // Skip if already found a trigger
if (triggerPos >= 0) return // Skip if already found a trigger
const text = inserted.toString()
if (!text) return
for (const char of triggerChars) {
if (text.includes(char)) {
shouldTrigger = true
triggerPos = toB
triggerCharacter = char
break
@ -78,7 +65,7 @@ export default function lspSignatureHelpExt(
}
})
if (shouldTrigger && triggerPos >= 0) {
if (triggerPos >= 0) {
await value.showSignatureHelpTooltip(
update.view,
triggerPos,