@flint.fyi/typescript-language 0.18.0 → 0.18.1

package/lib/directives/parseDirectivesFromTypeScriptFile.js

@@ -1,5 +1,6 @@
 import { normalizeRange } from "../normalizeRange.js";
 import { DirectivesCollector } from "@flint.fyi/core";
+import ts from "typescript";
 import { nullThrows } from "@flint.fyi/utils";
 import * as tsutils from "ts-api-utils";
 //#region src/directives/parseDirectivesFromTypeScriptFile.ts
@@ -9,13 +10,14 @@ function extractDirectivesFromTypeScriptFile(sourceFile) {
 		const commentText = fullText.slice(sourceRange.pos, sourceRange.end);
 		const match = /^\/\/\s*flint-(\S+)(?:\s+(.+))?/.exec(commentText);
 		if (!match) return;
-		const range = normalizeRange({
+		let range = normalizeRange({
 			begin: sourceRange.pos,
 			end: sourceRange.end
 		}, sourceFile);
 		const matches = match.slice(1);
 		const type = nullThrows(matches[0], "First match is expected to be present by the regex match");
 		const selection = matches[1] ?? "";
+		if (type === "disable-next-line") range = extendRangeToNextCodeLine(sourceFile, range);
 		directives.push({
 			range,
 			selection,
@@ -29,6 +31,35 @@ function parseDirectivesFromTypeScriptFile(sourceFile) {
 	for (const { range, selection, type } of extractDirectivesFromTypeScriptFile(sourceFile)) collector.add(range, selection, type);
 	return collector.collect();
 }
+function computeNextCodeLine(sourceFile, directiveLine) {
+	const lineStarts = sourceFile.getLineStarts();
+	const nextLineStart = lineStarts[directiveLine + 1];
+	if (nextLineStart === void 0) return;
+	const scanner = ts.createScanner(sourceFile.languageVersion, true, sourceFile.languageVariant, sourceFile.text, void 0, nextLineStart);
+	if (scanner.scan() === ts.SyntaxKind.EndOfFileToken) return;
+	const tokenPos = scanner.getTokenStart();
+	const codeLine = sourceFile.getLineAndCharacterOfPosition(tokenPos).line;
+	for (let line = directiveLine + 1; line < codeLine; line++) {
+		const start = lineStarts[line];
+		const end = lineStarts[line + 1] ?? sourceFile.text.length;
+		if (sourceFile.text.slice(start, end).trim() === "") return;
+	}
+	return codeLine;
+}
+function extendRangeToNextCodeLine(sourceFile, range) {
+	const codeLine = computeNextCodeLine(sourceFile, range.begin.line);
+	if (codeLine === void 0 || codeLine <= range.end.line + 1) return range;
+	const endPosition = nullThrows(sourceFile.getLineStarts()[codeLine], "Code line start is expected to be present by the computed code line") - 1;
+	const { character, line } = sourceFile.getLineAndCharacterOfPosition(endPosition);
+	return {
+		...range,
+		end: {
+			column: character,
+			line,
+			raw: endPosition
+		}
+	};
+}
 //#endregion
 export { extractDirectivesFromTypeScriptFile, parseDirectivesFromTypeScriptFile };
 

package/lib/package.js

@@ -1,6 +1,6 @@
 //#region package.json
 var name = "@flint.fyi/typescript-language";
-var version = "0.18.0";
+var version = "0.18.1";
 //#endregion
 export { name, version };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flint.fyi/typescript-language",
-  "version": "0.18.0",
+  "version": "0.18.1",
   "description": "[Experimental] TypeScript language for Flint.",
   "homepage": "https://flint.fyi",
   "repository": {
@@ -27,7 +27,7 @@
     "debug-for-file": "^0.3.0",
     "ts-api-utils": "^2.4.0",
     "typescript": "^5.9.0 || ^6.0.0",
-    "@flint.fyi/core": "^0.21.0",
+    "@flint.fyi/core": "^0.21.1",
     "@flint.fyi/utils": "^0.14.1"
   },
   "devDependencies": {