From c17775323baf93e0d9bd44a6f83cd32a986b6fcb Mon Sep 17 00:00:00 2001 From: _ov4 Date: Wed, 21 Oct 2026 10:50:48 +0000 Subject: refactor(plugin): share formatting triggers and selection boundaries Co-Authored-By: Claude Opus 5.5 --- plugin/src/extension.js | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'plugin/src/extension.js') diff --git a/plugin/src/extension.js b/plugin/src/extension.js index 6bd1255..8fd5d22 100644 --- a/plugin/src/extension.js +++ b/plugin/src/extension.js @@ -1,8 +1,7 @@ 'use strict'; const vscode = require('vscode'); -const { indentationEdits } = require('./indentation'); -const { codeOnly } = require('./lexical'); +const { indentationEdits, onTypeCharacters, shouldFormatOnType, selectionEndLine } = require('./indentation'); const { unmatchedBrackets } = require('./brackets'); const { registerRunner } = require('./runner'); const languageId = 'cie-pseudocode'; @@ -42,18 +41,16 @@ function activate(context) { vscode.window.onDidChangeVisibleTextEditors(() => refreshBrackets()), vscode.languages.registerDocumentRangeFormattingEditProvider(languageId, { provideDocumentRangeFormattingEdits(document, range) { - const endLine = range.end.character === 0 && range.end.line > range.start.line - ? range.end.line - 1 : range.end.line; + const endLine = selectionEndLine(range.start.line, range.end.line, range.end.character); return formatLines(document, range.start.line, endLine); } }), vscode.languages.registerOnTypeFormattingEditProvider(languageId, { provideOnTypeFormattingEdits(document, position, char) { - if (char !== '\n' && !/^\s*(?:ELSE|ENDIF|ENDWHILE|UNTIL|NEXT|ENDFUNCTION|ENDPROCEDURE|ENDTYPE|CATCH|ENDTRY)\b/.test( - codeOnly(document.lineAt(position.line).text))) return []; + if (!shouldFormatOnType(document.lineAt(position.line).text, char)) return []; return formatLines(document, position.line, position.line, char === '\n'); } - }, '\n', 'E', 'F', 'L', 'T', 'N', 'H', 'Y') + }, ...onTypeCharacters) ); refreshBrackets(); } -- cgit v1.3.1-4-g156e