stan-language-server 0.3.0 → 0.3.1

package/README.md

@@ -116,6 +116,8 @@ and add the following to your `init.el`:
 
 ## For developers
 
+Development uses [bun](https://bun.sh/)
+
 To install dependencies:
 
 ```bash

package/dist/handlers/compilation/includes.d.ts

@@ -1,5 +1,5 @@
 import { TextDocuments, WorkspaceFolder, type RemoteConsole } from "vscode-languageserver";
-import type { TextDocument } from "vscode-languageserver-textdocument";
+import { TextDocument } from "vscode-languageserver-textdocument";
 import type { FileSystemReader } from "../../types";
 export type Filename = string;
 export type FileContent = string;
@@ -8,4 +8,4 @@ export type FilePathError = {
 };
 export declare function getFilenames(fileContent: string): Filename[];
 export declare function isFilePathError(value: unknown): value is FilePathError;
-export declare function handleIncludes(document: TextDocument, documentManager: TextDocuments<TextDocument>, workspaceFolders: WorkspaceFolder[], includePaths: string[], logger: RemoteConsole, reader?: FileSystemReader): Promise<Record<Filename, FileContent>>;
+export declare function handleIncludes(document: TextDocument, documentManager: TextDocuments<TextDocument>, workspaceFolders: WorkspaceFolder[], includePaths: string[], logger: RemoteConsole, reader?: FileSystemReader, alreadyIncluded?: Set<Filename>): Promise<Record<Filename, FileContent>>;

package/dist/server/index.js

@@ -1,5 +1,5 @@
 // src/server/index.ts
-import { TextDocument } from "vscode-languageserver-textdocument";
+import { TextDocument as TextDocument2 } from "vscode-languageserver-textdocument";
 import {
   DiagnosticRefreshRequest,
   DidChangeConfigurationNotification,
@@ -566,6 +566,7 @@ function provideDiagnostics(compilerResult) {
 
 // src/handlers/compilation/includes.ts
 import { join } from "path";
+import { TextDocument } from "vscode-languageserver-textdocument";
 import { URI, Utils } from "vscode-uri";
 function getFilenames(fileContent) {
   const includePattern = /#include\s*[<"]?([^>"\s]*)[>"]?/g;
@@ -576,13 +577,16 @@ function getFilenames(fileContent) {
 function isFilePathError(value) {
   return typeof value === "object" && value !== null && "msg" in value;
 }
-async function handleIncludes(document, documentManager, workspaceFolders, includePaths, logger, reader) {
+async function handleIncludes(document, documentManager, workspaceFolders, includePaths, logger, reader, alreadyIncluded = new Set) {
   try {
     const includeFilenames = getFilenames(document.getText());
     if (includeFilenames.length === 0) {
       return {};
     }
     const allResults = await Promise.all(includeFilenames.map(async (filename) => {
+      if (alreadyIncluded.has(filename)) {
+        return [filename, { msg: `File already included: ${filename}` }];
+      }
       try {
         const content = await readIncludedFile(document, documentManager, workspaceFolders, includePaths, filename, reader);
         return [filename, content];
@@ -591,7 +595,10 @@ async function handleIncludes(document, documentManager, workspaceFolders, inclu
       }
     }));
     const validResults = allResults.filter(([_, content]) => !isFilePathError(content));
-    return Object.fromEntries(validResults);
+    const currentlyIncluded = new Set(validResults.map(([filename, _]) => filename)).union(alreadyIncluded);
+    const recursiveIncludes = await Promise.all(validResults.map(async ([_, content]) => await handleIncludes(content, documentManager, workspaceFolders, includePaths, logger, reader, currentlyIncluded)));
+    const results = validResults.map(([filename, contents]) => [filename, contents.getText()]).concat(recursiveIncludes.map(Object.entries).flat());
+    return Object.fromEntries(results);
   } catch (error) {
     logger.warn(`Resolving included files failed: ${error}`);
     return Promise.resolve({});
@@ -604,10 +611,7 @@ var readIncludedFile = async (document, documentManager, workspaceFolders, inclu
     return Promise.resolve(includedFileContent);
   }
   if (reader) {
-    includedFileContent = await readIncludedFileFromFileSystem(filename, [
-      currentDir.fsPath,
-      ...includePaths
-    ], reader);
+    includedFileContent = await readIncludedFileFromFileSystem(filename, [currentDir.fsPath, ...includePaths], reader);
   }
   if (!isFilePathError(includedFileContent)) {
     return Promise.resolve(includedFileContent);
@@ -628,13 +632,14 @@ var readIncludedFileFromWorkspace = (documentManager, workspaceFolders, filename
   if (!includedFile) {
     return Promise.resolve({ msg: `File not found: ${filename}` });
   }
-  return Promise.resolve(includedFile.getText());
+  return Promise.resolve(includedFile);
 };
 var readIncludedFileFromFileSystem = async (filename, dirs, fileSystemReader) => {
   for (const currentDir of dirs) {
     try {
       const localPath = join(currentDir, filename);
-      return await fileSystemReader(localPath);
+      const content = await fileSystemReader(localPath);
+      return TextDocument.create(URI.file(localPath).toString(), "stan", 0, content);
     } catch (error) {}
   }
   return Promise.resolve({ msg: `File not found: ${filename}` });
@@ -786,7 +791,7 @@ var startLanguageServer = (connection, reader) => {
     documentSettings.set(resource, docSettings);
     return docSettings;
   };
-  const documents = new TextDocuments3(TextDocument);
+  const documents = new TextDocuments3(TextDocument2);
   connection.onCompletion((params) => {
     return handleCompletion(params, documents);
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "stan-language-server",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "Language Server Protocol implementation for the Stan probabilistic programming language",
   "main": "dist/server/index.js",
   "module": "src/server/index.ts",
@@ -64,7 +64,7 @@
   },
   "devDependencies": {
     "@types/bun": "latest",
-    "@types/node": "24.7.0",
+    "@types/node": "24.8.1",
     "@typescript-eslint/eslint-plugin": "^8.0.0",
     "@typescript-eslint/parser": "^8.0.0",
     "eslint": "^9.0.0",