more user-friendly

nix-community · Aug 11, 2024 · 52323b0 · 52323b0
1 parent d08d5fe
commit 52323b0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/nixd/lib/Controller/AST.h b/nixd/lib/Controller/AST.h
@@ -41,7 +41,7 @@ struct VLAException : std::exception {};
 
 struct NoLocationForBuiltinVariable : std::exception {
   [[nodiscard]] const char *what() const noexcept override {
-    return "builtin variable is not defined in nix source location";
+    return "builtins are defined in the interpreter, not in the Nix files";
   }
 };
 

diff --git a/nixd/lib/Controller/Definition.cpp b/nixd/lib/Controller/Definition.cpp
@@ -312,9 +312,8 @@ defineVar(const ExprVar &Var, const VariableLookupAnalysis &VLA,
       return StaticLocs;
     }
   } catch (std::exception &E) {
-    // Pop a window, notify the user we cannot find static definition.
-    // Likely this will be triggerred by clicking "builtins"
-    return error(E.what());
+    elog("definition/static: {0}", E.what());
+    return Locations{};
   }
   return error("unreachable code! Please submit an issue");
 }

diff --git a/nixd/tools/nixd/test/definition/builtin.md b/nixd/tools/nixd/test/definition/builtin.md
@@ -56,9 +56,9 @@
 ```
 
 ```
-CHECK:      "message": "builtin variable is not defined in nix source location"
-CHECK-NEXT: },
-CHECK-NEXT: "id": 2,
+     CHECK: "id": 2,
+CHECK-NEXT: "jsonrpc": "2.0",
+CHECK-NEXT: "result": null
 ```