luaut-language-server 2.1.0 → 3.0.0

package/dist/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   startServer
-} from "./chunk-HJ2C3OFZ.js";
+} from "./chunk-X2GHHRWT.js";
 
 // src/cli.ts
 startServer();

package/dist/index.cjs

@@ -819,11 +819,28 @@ var import_luaut_parser4 = require("luaut-parser");
 function hover(analysis, position) {
   const path = pathAt(analysis.program, position, true);
   for (let i = path.length - 1; i >= 0; i--) {
+    if (UNNAMED.has(path[i].type)) return null;
     const text = describe(analysis, path, i);
     if (text) return { contents: { kind: "markdown", value: code(text) }, range: toRange(path[i]) };
   }
   return null;
 }
+var UNNAMED = /* @__PURE__ */ new Set([
+  "BinaryExpression",
+  "UnaryExpression",
+  "CallExpression",
+  "MethodCallExpression",
+  "MemberExpression",
+  "IndexExpression",
+  "ParenthesizedExpression",
+  "IfElseExpression",
+  "TableExpression",
+  "ArrayExpression",
+  "TypeAssertionExpression",
+  "SatisfiesExpression",
+  "AsConstExpression",
+  "InterpolatedStringExpression"
+]);
 var PRIMITIVES = /* @__PURE__ */ new Set(["any", "unknown", "never", "nil", "boolean", "number", "string", "thread", "buffer"]);
 function describe(analysis, path, index) {
   const { types } = analysis;
@@ -899,7 +916,7 @@ function describe(analysis, path, index) {
       const binding = bindingOfNode(analysis, identifier2);
       if (binding) {
         const type2 = types.bindingType.get(binding.id);
-        if (type2) return `${keyword(binding)} ${binding.name}: ${pretty(type2)}`;
+        if (type2) return bindingText(binding, type2);
       }
       if (parent?.type === "MemberExpression" || parent?.type === "MethodCallExpression") {
         const type2 = types.typeOf.get(parent);
@@ -907,13 +924,13 @@ function describe(analysis, path, index) {
       }
       return void 0;
     }
-    // Declarations: `const x`, a parameter, `const function f`.
+    // Declarations: `const x`, a parameter.
     case "IdentifierPattern":
     case "FunctionParameter":
     case "TypedIdentifier": {
       const binding = bindingOfNode(analysis, node);
       const type2 = binding && types.bindingType.get(binding.id);
-      return type2 ? `${keyword(binding)} ${binding.name}: ${pretty(type2)}` : void 0;
+      return type2 ? bindingText(binding, type2) : void 0;
     }
     // A type written by name: `number`, `Shape`, `Partial<User>`, or a type
     // parameter in scope.
@@ -1029,10 +1046,19 @@ ${lines.join("\n")}
   }
   return flat;
 }
+function bindingText(binding, type) {
+  if (binding.declaredBy === "function" && type.kind === "function") {
+    return `function ${binding.name}${(0, import_luaut_parser4.formatType)(type)}`;
+  }
+  return `${keyword(binding)} ${binding.name}: ${pretty(type)}`;
+}
 function keyword(binding) {
   if (binding.kind === "param" || binding.kind === "self") return "(parameter)";
   if (binding.kind === "global") return "(global)";
   if (binding.kind.startsWith("for-")) return "(loop variable)";
+  if (binding.declaredBy === "import" || binding.declaredBy === "namespace") return "(import)";
+  if (binding.declaredBy === "type") return "(type import)";
+  if (binding.declaredBy === "function") return "function";
   return binding.isConst ? "const" : "let";
 }
 function code(text) {
@@ -1228,6 +1254,7 @@ function valueItems(analysis, at) {
   const seen = /* @__PURE__ */ new Set();
   for (const binding of analysis.scopes.bindings.values()) {
     if (binding.name === PLACEHOLDER || seen.has(binding.name)) continue;
+    if (binding.declaredBy === "type") continue;
     const declaration = binding.declarationNode;
     if (declaration && declaration.line.start - 1 > at.line) continue;
     seen.add(binding.name);
@@ -1596,10 +1623,14 @@ function identifier(analysis, node, parent, add) {
       break;
     case "ImportSpecifier": {
       const binding2 = bindingOfNode(analysis, node);
+      if (binding2?.declaredBy === "type") return as("type", ["declaration"]);
       const value = binding2 && analysis.types.bindingType.get(binding2.id);
       if (analysis.types.aliases.has(name) && (!value || value.kind === "any")) return as("type", ["declaration"]);
       break;
     }
+    case "ImportStatement":
+      if (parent.namespaceImport === node) return as("namespace", ["declaration"]);
+      break;
     case "ExportSpecifier":
       if (!bindingOfNode(analysis, node) && analysis.types.aliases.has(name)) return as("type");
       break;
@@ -1615,6 +1646,7 @@ function identifier(analysis, node, parent, add) {
 function valueKind(analysis, binding) {
   if (!binding) return "variable";
   if (binding.kind === "param" || binding.kind === "self") return "parameter";
+  if (binding.declaredBy === "namespace") return "namespace";
   return isFunction(analysis.types.bindingType.get(binding.id)) ? "function" : "variable";
 }
 function modifiersOf(binding, isDeclaration) {