stan-language-server-bin 0.4.6 → 0.4.8

package/bin/cli.js

@@ -9897,6 +9897,8 @@ var DATATYPES = [
   "int",
   "real",
   "complex",
+  "array",
+  "tuple",
   "vector",
   "row_vector",
   "matrix",
@@ -9928,17 +9930,12 @@ var KEYWORDS = [
   "for",
   "in",
   "while",
-  "repeat",
-  "until",
   "if",
   "then",
   "else",
   "break",
   "continue",
   "return",
-  "true",
-  "false",
-  "target",
   "functions",
   "data",
   "transformed",
@@ -9950,21 +9947,11 @@ var KEYWORDS = [
   "reject",
   "fatal_error",
   "profile",
-  "get_lp",
-  "struct",
-  "typedef",
-  "export",
-  "auto",
-  "extern",
-  "var",
-  "static",
-  "array",
   "lower",
   "upper",
   "offset",
   "multiplier",
-  "tuple",
-  "truncate",
+  "target",
   "jacobian"
 ].map(keywordToCompletionItem);
 
@@ -30274,6 +30261,12 @@ var getFunctions = () => {
 var FUNCTIONS = getFunctions();
 
 // src/handlers/completion.ts
+var addTextEdit = (item, position, prefix_length) => {
+  const start = { line: position.line, character: position.character - prefix_length };
+  const end = position;
+  const textEdit = { range: { start, end }, newText: item.insertText || item.label };
+  return { ...item, textEdit };
+};
 var COMPLETION_TRIE = new import_trie_search.default("label", {
   splitOnRegEx: /[\s_]/g,
   min: 0
@@ -30285,7 +30278,7 @@ COMPLETION_TRIE.addAll([
   ...FUNCTIONS,
   ...SNIPPETS
 ]);
-var searchWords = (textUpToCursor, supportsSnippets) => {
+var searchWords = (position, textUpToCursor, supportsSnippets) => {
   const match = textUpToCursor.match(/(?:^|\s)([\w_]+)$/);
   if (match) {
     const word = match[1] || "";
@@ -30293,7 +30286,7 @@ var searchWords = (textUpToCursor, supportsSnippets) => {
     if (!supportsSnippets) {
       return completionProposals.filter((item) => item.kind !== import_vscode_languageserver7.CompletionItemKind.Snippet);
     }
-    return completionProposals;
+    return completionProposals.map((item) => addTextEdit(item, position, word.length));
   }
   return [];
 };
@@ -30302,7 +30295,7 @@ var DISTRIBUTION_TRIE = new import_trie_search.default("label", {
   min: 0
 });
 DISTRIBUTION_TRIE.addAll(DISTRIBUTIONS);
-var searchDistributions = (textUpToCursor) => {
+var searchDistributions = (position, textUpToCursor) => {
   const match = textUpToCursor.match(/.*~\s*([\w_]*)$/);
   if (match) {
     const distName = match[1] || "";
@@ -30312,7 +30305,7 @@ var searchDistributions = (textUpToCursor) => {
     } else {
       completionProposals = DISTRIBUTION_TRIE.search(distName);
     }
-    return completionProposals;
+    return completionProposals.map((item) => addTextEdit(item, position, distName.length));
   }
   return [];
 };
@@ -30322,15 +30315,15 @@ var getTextUpToCursor = (text, position) => {
   const currentLine = lines[position.line] || "";
   return currentLine.substring(0, position.character);
 };
-function handleCompletion(params, documents, supportsSnippets) {
-  const document = documents.get(params.textDocument.uri);
-  if (!document) {
+function handleCompletion({ position, textDocument }, documents, supportsSnippets) {
+  const document = documents.get(textDocument.uri);
+  if (!document || !document.languageId.startsWith("stan")) {
     return [];
   }
-  const textUpToCursor = getTextUpToCursor(document.getText(), params.position);
+  const textUpToCursor = getTextUpToCursor(document.getText(), position);
   return [
-    ...searchDistributions(textUpToCursor),
-    ...searchWords(textUpToCursor, supportsSnippets)
+    ...searchDistributions(position, textUpToCursor),
+    ...searchWords(position, textUpToCursor, supportsSnippets)
   ];
 }
 // src/handlers/diagnostics.ts
@@ -30369,7 +30362,7 @@ function getRangeFromMessage(message) {
 }
 function getWarningMessage(message) {
   const msg = String(message);
-  let warning = msg.replace(/Warning.*column \d+: /s, "");
+  let warning = msg.replace(/Warning.*column \d+:/s, "");
   warning = warning.replace(/\s+/gs, " ");
   warning = warning.trim();
   warning = msg.includes("included from") ? `Warning in included file:
@@ -30880,32 +30873,32 @@ var readIncludedFileFromFileSystem = async (filename, dirs, fileSystemReader) =>
 // src/handlers/compilation/compilation.ts
 var defaultSettings = {
   maxLineLength: 78,
-  includePaths: []
+  includePaths: [],
+  warnPedantic: false
 };
-async function handleCompilation(document, documentManager, workspaceFolders, settings, logger, reader) {
+async function handleCompilation(document, documentManager, workspaceFolders, settings, purpose, logger, reader) {
   const filename = URI.parse(document.uri).fsPath;
   const code = document.getText();
   const includes = await handleIncludes(document, documentManager, workspaceFolders, settings.includePaths, logger, reader);
-  const stanc_args = [
-    "auto-format",
-    `filename-in-msg=${filename}`,
-    `max-line-length=${settings.maxLineLength}`,
-    "canonicalze=deprecations",
-    "allow-undefined"
-  ];
+  const stanc_args = [`filename-in-msg=${filename}`, "allow-undefined"];
   if (filename.endsWith(".stanfunctions")) {
     stanc_args.push("functions-only");
   }
+  if (purpose === "formatting") {
+    stanc_args.push("auto-format", `max-line-length=${settings.maxLineLength}`, "canonicalze=deprecations");
+  } else if (settings.warnPedantic) {
+    stanc_args.push("warn-pedantic");
+  }
   return Promise.resolve(stanc(filename, code, stanc_args, includes));
 }
 
 // src/handlers/diagnostics.ts
 async function handleDiagnostics(params, documents, workspaceFolders, settings, logger, reader) {
   const document = documents.get(params.textDocument.uri);
-  if (!document) {
+  if (!document || !document.languageId.startsWith("stan")) {
     return [];
   }
-  const compilerResult = await handleCompilation(document, documents, workspaceFolders, settings, logger, reader);
+  const compilerResult = await handleCompilation(document, documents, workspaceFolders, settings, "linting", logger, reader);
   const diagnostics = provideDiagnostics(compilerResult).map((diagnostic) => {
     if (diagnostic.severity === "error") {
       return {
@@ -30928,10 +30921,10 @@ async function handleDiagnostics(params, documents, workspaceFolders, settings,
 // src/handlers/formatting.ts
 async function handleFormatting(params, documents, workspaceFolders, settings, logger, reader) {
   const document = documents.get(params.textDocument.uri);
-  if (!document) {
+  if (!document || !document.languageId.startsWith("stan")) {
     return [];
   }
-  const result = await handleCompilation(document, documents, workspaceFolders, settings, logger, reader);
+  const result = await handleCompilation(document, documents, workspaceFolders, settings, "formatting", logger, reader);
   if (result.errors && result.errors.length > 0) {
     return { errors: result.errors };
   } else if (result.result) {
@@ -30963,7 +30956,7 @@ var startLanguageServer = (connection, reader) => {
     hasConfigurationCapability = Boolean(capabilities.workspace?.configuration);
     hasDynamicConfigurationRequestCapability = Boolean(capabilities.workspace?.configuration && capabilities.workspace?.didChangeConfiguration?.dynamicRegistration);
     hasWorkspaceFolderCapability = Boolean(capabilities.workspace?.workspaceFolders);
-    hasSnippetSupport = Boolean(capabilities.textDocument?.completion?.completionItem?.snippetSupport);
+    hasSnippetSupport = Boolean(capabilities.textDocument?.completion?.completionItem?.snippetSupport || capabilities.textDocument?.completion?.completionItemKind?.valueSet?.some((kind) => kind === import_node.CompletionItemKind.Snippet));
     return {
       capabilities: {
         textDocumentSync: import_node.TextDocumentSyncKind.Incremental,
@@ -31061,7 +31054,7 @@ var startLanguageServer = (connection, reader) => {
   });
   connection.onHover((params) => {
     const document = documents.get(params.textDocument.uri);
-    if (!document) {
+    if (!document || !document.languageId.startsWith("stan")) {
       return null;
     }
     return hover_default(document, params);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "stan-language-server-bin",
-  "version": "0.4.6",
+  "version": "0.4.8",
   "description": "CLI distribution of the Stan language server",
   "bin": {
     "stan-language-server": "bin/cli.js"