@algosail/lsp 0.1.5 → 0.1.7

package/lib/completion.js

@@ -2,7 +2,7 @@ import { CompletionItemKind } from 'vscode-languageserver'
 import { MarkupKind } from 'vscode-languageserver-types'
 import { builtinWords } from '@algosail/builtins'
 
-export function getCompletionItems(parser, uri) {
+export function getCompletionItems(connection, parser, uri) {
   const items = []
 
   for (const b of Object.values(builtinWords)) {
@@ -15,10 +15,12 @@ export function getCompletionItems(parser, uri) {
   }
 
   const ast = parser.getAST(uri)
+  connection.console.error(`[sail-lsp] Failed to parse ${uri}: ${ast}`)
+
   if (!ast) return items
 
   for (const [key, module] of Object.entries(ast.modules)) {
-    for (const group of module.groups) {
+    for (const group of Object.values(module.groups)) {
       items.push({
         label: `~${key}&${group.name}`,
         kind: CompletionItemKind.Enum,
@@ -27,33 +29,33 @@ export function getCompletionItems(parser, uri) {
       })
     }
 
-    for (const tag of module.tags) {
+    for (const tag of Object.values(module.tags)) {
       items.push({
         label: `~${key}#${tag.name}`,
         kind: CompletionItemKind.EnumMember,
-        detail: `Tag constructor in ~${key}&${tag.group}`,
+        detail: `Tag constructor in ~${key}&${tag.group.name}`,
         documentation: tag.doc ? { kind: MarkupKind.Markdown, value: tag.doc } : undefined,
       })
       items.push({
         label: `~${key}_${tag.name}`,
         kind: CompletionItemKind.EnumMember,
-        detail: `Tag pattern in ~${key}&${tag.group}`,
+        detail: `Tag pattern in ~${key}&${tag.group.name}`,
         documentation: tag.doc ? { kind: MarkupKind.Markdown, value: tag.doc } : undefined,
       })
     }
 
-    for (const map of module.maps) {
+    for (const map of Object.values(module.maps)) {
       items.push({
         label: `~${key}$${map.name}`,
         kind: CompletionItemKind.Struct,
-        detail: `Map %${map.name}`,
+        detail: `Map $${map.name}`,
         documentation: map.doc ? { kind: MarkupKind.Markdown, value: map.doc } : undefined,
       })
       for (const field of map.fields) {
         items.push({
           label: `~${key}$${map.name}.${field.name}`,
           kind: CompletionItemKind.Field,
-          detail: `Field :${field.name}${field.type ? ` (${field.type.kind})` : ''} of ~${key}$${map.name}`,
+          detail: `Field .${field.name}${field.type ? ` (${field.type.kind})` : ''} of ~${key}$${map.name}`,
           documentation: field.doc ? { kind: MarkupKind.Markdown, value: field.doc } : undefined,
         })
       }
@@ -69,7 +71,7 @@ export function getCompletionItems(parser, uri) {
     }
   }
 
-  for (const group of ast.groups) {
+  for (const group of Object.values(ast.groups)) {
     items.push({
       label: `&${group.name}`,
       kind: CompletionItemKind.Enum,
@@ -78,33 +80,33 @@ export function getCompletionItems(parser, uri) {
     })
   }
 
-  for (const tag of ast.tags) {
+  for (const tag of Object.values(ast.tags)) {
     items.push({
       label: `#${tag.name}`,
       kind: CompletionItemKind.EnumMember,
-      detail: `Tag constructor in &${tag.group}`,
+      detail: `Tag constructor in &${tag.group.name}`,
       documentation: tag.doc ? { kind: MarkupKind.Markdown, value: tag.doc } : undefined,
     })
     items.push({
       label: `_${tag.name}`,
       kind: CompletionItemKind.EnumMember,
-      detail: `Tag pattern in &${tag.group}`,
+      detail: `Tag pattern in &${tag.group.name}`,
       documentation: tag.doc ? { kind: MarkupKind.Markdown, value: tag.doc } : undefined,
     })
   }
 
-  for (const map of ast.maps) {
+  for (const map of Object.values(ast.maps)) {
     items.push({
       label: `$${map.name}`,
       kind: CompletionItemKind.Struct,
-      detail: `Map %${map.name}`,
+      detail: `Map $${map.name}`,
       documentation: map.doc ? { kind: MarkupKind.Markdown, value: map.doc } : undefined,
     })
     for (const field of map.fields) {
       items.push({
         label: `$${map.name}.${field.name}`,
         kind: CompletionItemKind.Field,
-        detail: `Field :${field.name}${field.type ? ` (${field.type.kind})` : ''} of $${map.name}`,
+        detail: `Field .${field.name}${field.type ? ` (${field.type.kind})` : ''} of $${map.name}`,
         documentation: field.doc ? { kind: MarkupKind.Markdown, value: field.doc } : undefined,
       })
     }

package/lib/validate.js

@@ -3,6 +3,7 @@ import { DiagnosticSeverity } from 'vscode-languageserver'
 export const validateDocument = async (connection, parser, uri, text) => {
   try {
     const res = await parser.parseSail(uri, text)
+    connection.console.error(`[sail-lsp] Failed to parse ${uri}: ${res}`)
 
     const diagnostics = res.errors.map((err) => ({
       severity: DiagnosticSeverity.Error,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@algosail/lsp",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "type": "module",
   "main": "index.js",
   "bin": {
@@ -8,7 +8,7 @@
   },
   "dependencies": {
     "@algosail/builtins": "^0.0.1",
-    "@algosail/parser": "^0.0.6",
+    "@algosail/parser": "^0.0.7",
     "vscode-languageserver": "^9.0.1",
     "vscode-languageserver-textdocument": "^1.0.11"
   }