diff options
Diffstat (limited to 'plugin/src')
| -rw-r--r-- | plugin/src/extension.js | 11 | ||||
| -rw-r--r-- | plugin/src/indentation.js | 11 |
2 files changed, 14 insertions, 8 deletions
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(); } diff --git a/plugin/src/indentation.js b/plugin/src/indentation.js index b7fca78..fd3f585 100644 --- a/plugin/src/indentation.js +++ b/plugin/src/indentation.js @@ -1,6 +1,15 @@ 'use strict'; const { codeOnly } = require('./lexical'); +const onTypeCharacters = ['\n', 'E', 'F', 'L', 'T', 'N', 'H', 'Y']; + +function shouldFormatOnType(line, character) { + return character === '\n' || /^\s*(?:ELSE|ENDIF|ENDWHILE|UNTIL|NEXT|ENDFUNCTION|ENDPROCEDURE|ENDTYPE|CATCH|ENDTRY)\b/.test(codeOnly(line)); +} + +function selectionEndLine(startLine, endLine, endColumn) { + return endColumn === 0 && endLine > startLine ? endLine - 1 : endLine; +} const closers = { ENDIF: 'IF', ENDWHILE: 'WHILE', UNTIL: 'REPEAT', NEXT: 'FOR', ENDFUNCTION: 'FUNCTION', ENDPROCEDURE: 'PROCEDURE', ENDTYPE: 'TYPE', ENDTRY: 'TRY' @@ -56,4 +65,4 @@ function indentationEdits(lines, startLine, endLine, keepBlankIndent = false) { return edits; } -module.exports = { lineDepths, indentationEdits }; +module.exports = { lineDepths, indentationEdits, onTypeCharacters, shouldFormatOnType, selectionEndLine }; |