stan-language-server 0.4.7 → 0.4.8

package/dist/handlers/completion.d.ts

@@ -1,4 +1,4 @@
 import { type CompletionParams, TextDocuments, CompletionItem } from "vscode-languageserver";
 import { TextDocument, type Position } from "vscode-languageserver-textdocument";
 export declare const getTextUpToCursor: (text: string, position: Position) => string;
-export declare function handleCompletion(params: CompletionParams, documents: TextDocuments<TextDocument>, supportsSnippets: boolean): CompletionItem[];
+export declare function handleCompletion({ position, textDocument }: CompletionParams, documents: TextDocuments<TextDocument>, supportsSnippets: boolean): CompletionItem[];

package/dist/server/index.js

@@ -6,7 +6,8 @@ import {
   DocumentDiagnosticRequest,
   MessageType,
   TextDocumentSyncKind,
-  TextDocuments as TextDocuments3
+  TextDocuments as TextDocuments3,
+  CompletionItemKind as CompletionItemKind8
 } from "vscode-languageserver/node";
 
 // src/handlers/completion.ts
@@ -38,6 +39,8 @@ var DATATYPES = [
   "int",
   "real",
   "complex",
+  "array",
+  "tuple",
   "vector",
   "row_vector",
   "matrix",
@@ -69,17 +72,12 @@ var KEYWORDS = [
   "for",
   "in",
   "while",
-  "repeat",
-  "until",
   "if",
   "then",
   "else",
   "break",
   "continue",
   "return",
-  "true",
-  "false",
-  "target",
   "functions",
   "data",
   "transformed",
@@ -91,21 +89,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);
 
@@ -475,6 +463,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 TrieSearch("label", {
   splitOnRegEx: /[\s_]/g,
   min: 0
@@ -486,7 +480,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] || "";
@@ -494,7 +488,7 @@ var searchWords = (textUpToCursor, supportsSnippets) => {
     if (!supportsSnippets) {
       return completionProposals.filter((item) => item.kind !== CompletionItemKind7.Snippet);
     }
-    return completionProposals;
+    return completionProposals.map((item) => addTextEdit(item, position, word.length));
   }
   return [];
 };
@@ -503,7 +497,7 @@ var DISTRIBUTION_TRIE = new TrieSearch("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] || "";
@@ -513,7 +507,7 @@ var searchDistributions = (textUpToCursor) => {
     } else {
       completionProposals = DISTRIBUTION_TRIE.search(distName);
     }
-    return completionProposals;
+    return completionProposals.map((item) => addTextEdit(item, position, distName.length));
   }
   return [];
 };
@@ -523,15 +517,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);
+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
@@ -572,7 +566,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:
@@ -791,7 +785,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 === CompletionItemKind8.Snippet));
     return {
       capabilities: {
         textDocumentSync: TextDocumentSyncKind.Incremental,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "stan-language-server",
-  "version": "0.4.7",
+  "version": "0.4.8",
   "description": "Language Server Protocol implementation for the Stan probabilistic programming language",
   "main": "dist/server/index.js",
   "module": "src/server/index.ts",