v2.6.9

Author: thqby

package.json

@@ -4,7 +4,7 @@
 	"description": "AutoHotkey v2 Language Support, based on vscode-lsp.",
 	"author": "thqby",
 	"publisher": "thqby",
-	"version": "2.6.8",
+	"version": "2.6.9",
 	"license": "LGPLv3.0",
 	"categories": [
 		"Formatters",

server/src/codeActionProvider.ts

@@ -8,7 +8,7 @@ export async function codeActionProvider(params: CodeActionParams & { indent?: s
 	const uri = params.textDocument.uri, lex = lexers[uri.toLowerCase()];
 	if (!lex || token.isCancellationRequested || lex.diag_pending !== undefined) return;
 	const acts: CodeAction[] = [], replaces: Record<string, TextEdit[]> = {}, parens: TextEdit[] = [];
-	const { document, linepos, tokens } = lex, { context: { diagnostics, only }, indent, range } = params;
+	const { document, line_ranges, tokens } = lex, { context: { diagnostics, only }, indent, range } = params;
 	const has_refactor = only?.includes(CodeActionKind.Refactor) !== false;
 	let m;
 
@@ -68,11 +68,19 @@ export async function codeActionProvider(params: CodeActionParams & { indent?: s
 		const so = document.offsetAt(start);
 		const tab = indent || configCache.FormatOptions?.indent_string || '\t';
 		const space = configCache.FormatOptions?.space_in_other === false ? '' : ' ';
-		for (const line in linepos) {
-			if (line as unknown as number < sl) continue;
-			let bo = linepos[line], tk, bk;
+		let l = 0, r = line_ranges.length - 1, rl = l, rr = r, i;
+		while (l <= r) {
+			const [a, b] = line_ranges[i = (l + r) >> 1];
+			if (a < sl)
+				l = rl = i + 1;
+			else if (r = i - 1, b > eo)
+				rr = r;
+		}
+		for (i = rl; i <= rr; i++) {
+			// eslint-disable-next-line prefer-const
+			let [line, bo] = line_ranges[i];
 			if (bo > eo) break;
-			bk = tokens[bo];
+			let tk, bk = tokens[bo];
 			if (!bk.body_start) continue;
 			while ((bk = tokens[bk.body_start!]).body_start && bk.offset <= so)
 				bo = bk.offset;
@@ -93,7 +101,7 @@ export async function codeActionProvider(params: CodeActionParams & { indent?: s
 						}
 					});
 				}
-				end = { line: parseInt(line) + 1, character: 0 };
+				end = { line: line + 1, character: 0 };
 				const o = document.offsetAt(end);
 				tk = lex.findToken(o, true);
 				if (tk.type === TokenType.Reserved && words.includes(tk.content.toLowerCase()))

server/src/formattingProvider.ts

@@ -49,31 +49,26 @@ export async function typeFormatting(params: DocumentOnTypeFormattingParams): Pr
 						}
 					});
 			}
-		} else if ((pp = lex.linepos[line - 1]) !== undefined) {
-			const range = { start: lex.document.positionAt(pp), end: { line: line - 1, character: s.length } };
-			const newText = lex.beautify(opts, range).trim();
-			result = [{ range, newText }];
-			indent_string = opts.indent_string;
-			if (linetexts[1].substring(0, character) !== indent_string)
-				result.push({
-					newText: indent_string,
-					range: { start: { line, character: 0 }, end: { line, character } }
-				});
-		} else if (!s) {
-			if (linetexts[0] !== (linetexts[1] = linetexts[1].substring(0, character))) {
-				if (!linetexts[0]) {
-					tk = lex.findToken(lex.document.offsetAt(position));
-					if (tk.type === TokenType.String || (tk.type & TokenType.Comment))
-						return;
-					const b = [TokenType.EOF, TokenType.BracketStart, TokenType.BlockStart];
-					while ((tk = tk.previous_token!)) {
-						if (b.includes(tk.type))
-							break;
-					}
-					if (b.includes(tk?.type, 1))
-						return;
+		} else if (s && !/^(;|\/\*)|[ \t];/.test(s.trimStart())) {
+			const start = { line, character: 0 }, offset = lex.document.offsetAt(start);
+			const rgs = lex.line_ranges, ll = line - 1;
+			let l = 0, r = rgs.length - 1, i;
+			while (l <= r) {
+				const [a, b] = rgs[i = (l + r) >> 1];
+				if (ll > a)
+					l = i + 1;
+				else if (ll < a && offset <= b)
+					r = i - 1;
+				else if (lex.findStrOrComment(offset))
+					break;
+				else {
+					const range = { start: lex.document.positionAt(b), end: { line: ll, character: s.length } };
+					const newText = lex.beautify(opts, range).trim();
+					result = [{ range, newText }];
+					if (linetexts[1].substring(0, character) !== (indent_string = opts.indent_string))
+						result.push({ newText: indent_string, range: { start, end: position } });
+					break;
 				}
-				result = [{ newText: linetexts[0], range: { start: { line, character: 0 }, end: { line, character } } }];
 			}
 		}
 		return result;
@@ -93,7 +88,7 @@ export async function typeFormatting(params: DocumentOnTypeFormattingParams): Pr
 	}
 
 	function format_end_with_brace(pos: Position): TextEdit[] | undefined {
-		tk = lex.tokens[lex.document.offsetAt({ line: pos.line, character: pos.character - 1 })];
+		tk = lex.tokens[lex.document.offsetAt(pos) - 1];
 		pp = tk?.previous_pair_pos;
 		if (pp !== undefined) {
 			while ((tk = lex.tokens[pp])?.previous_pair_pos !== undefined)