From efe9b77c2f2af63204dc5c1f948814f631d0787a Mon Sep 17 00:00:00 2001 From: Sainan <63328889+Sainan@users.noreply.github.com> Date: Mon, 25 Aug 2025 04:24:16 +0200 Subject: [PATCH] Fix indentation pattern for local entry --- Pluto.tmbundle/Preferences/Indentation Rules.tmPreferences | 2 +- language-config.json | 2 +- test.js | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Pluto.tmbundle/Preferences/Indentation Rules.tmPreferences b/Pluto.tmbundle/Preferences/Indentation Rules.tmPreferences index e972573..8478b8f 100644 --- a/Pluto.tmbundle/Preferences/Indentation Rules.tmPreferences +++ b/Pluto.tmbundle/Preferences/Indentation Rules.tmPreferences @@ -7,7 +7,7 @@ increaseIndentPattern - (^\s*\$?(?!declare\s+function\b)\b((local)?[\s\w=]+)?(function(?!\s*\([^)]*\)\s*:)|repeat|else|elseif|if|while|class|pluto_class|enum|pluto_enum|try|pluto_try)\b((?!\bend\b).)*$|^.*\b(do|then)\b((?!\bend\b).)*$|^.*\{((?!\}).)*$) + (^\s*\$?(?!declare\s+function\b)\b((local)?[\s\w=]+)?\b(function(?!\s*\([^)]*\)\s*:)|repeat|else|elseif|if|while|class|pluto_class|enum|pluto_enum|try|pluto_try)\b((?!\bend\b).)*$|^.*\b(do|then)\b((?!\bend\b).)*$|^.*\{((?!\}).)*$) decreaseIndentPattern (^\s*\$?\b(elsei|elseif|else|catch|pluto_catch|end|until)\b.*$|^((?!\{).)*\}\;?.*$) diff --git a/language-config.json b/language-config.json index 2947597..ea2f1a2 100644 --- a/language-config.json +++ b/language-config.json @@ -5,7 +5,7 @@ }, // Keep in sync with Pluto.tmbundle/Preferences/Indentation Rules.tmPreferences "indentationRules": { - "increaseIndentPattern": "(^\\s*\\$?(?!declare\\s+function\\b)\\b((local)?[\\s\\w=]+)?(function(?!\\s*\\([^)]*\\)\\s*:)|repeat|else|elseif|if|while|class|pluto_class|enum|pluto_enum|try|pluto_try)\\b((?!\\bend\\b).)*$|^.*\\b(do|then)\\b((?!\\bend\\b).)*$|^.*\\{((?!\\}).)*$)", + "increaseIndentPattern": "(^\\s*\\$?(?!declare\\s+function\\b)\\b((local)?[\\s\\w=]+)?\\b(function(?!\\s*\\([^)]*\\)\\s*:)|repeat|else|elseif|if|while|class|pluto_class|enum|pluto_enum|try|pluto_try)\\b((?!\\bend\\b).)*$|^.*\\b(do|then)\\b((?!\\bend\\b).)*$|^.*\\{((?!\\}).)*$)", "decreaseIndentPattern": "(^\\s*\\$?\\b(elsei|elseif|else|catch|pluto_catch|end|until)\\b.*$|^((?!\\{).)*\\}\\;?.*$)" } } diff --git a/test.js b/test.js index 1e2f4fb..2d15767 100644 --- a/test.js +++ b/test.js @@ -362,6 +362,7 @@ async function main() checkIndentation("}", false, true); checkIndentation("$type Func = function(_: string): void", false, false); checkIndentation("$declare function tonumber(str: string, base: ?number): number", false, false); + checkIndentation("local entry", false, false); if (!ok) {