fix @hegel/language-server

JSMonk · May 25, 2020 · 41ee42c · 41ee42c
1 parent ea81a6e
commit 41ee42c
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 16 deletions.
diff --git a/...s/language-server/.vscode/extensions.json → .vscode/extensions.json b/...s/language-server/.vscode/extensions.json → .vscode/extensions.json
diff --git a/packages/language-server/.vscode/launch.json → .vscode/launch.json b/packages/language-server/.vscode/launch.json → .vscode/launch.json
@@ -16,16 +16,16 @@
       "type": "extensionHost",
       "request": "launch",
       "runtimeExecutable": "${execPath}/client/client.js",
-      "args": ["--extensionDevelopmentPath=${workspaceFolder}"]
+      "args": ["--extensionDevelopmentPath=${workspaceFolder}/packages/language-server"]
     },
     {
       "name": "Extension Tests",
       "type": "extensionHost",
       "request": "launch",
       "runtimeExecutable": "${execPath}/client/client.js",
       "args": [
-        "--extensionDevelopmentPath=${workspaceFolder}",
-        "--extensionTestsPath=${workspaceFolder}/test"
+        "--extensionDevelopmentPath=${workspaceFolder}/packages/language-server",
+        "--extensionTestsPath=${workspaceFolder}/packages/language-server/test"
       ]
     }
   ]

diff --git a/packages/cli/.hegelrc b/packages/cli/.hegelrc
@@ -3,6 +3,7 @@ include:
 exclude:
   - ./node_modules/**
   - ./build/**
+  - ./.history/**
 types:
   - ./@types
   - ./node_modules/@types

diff --git a/packages/language-server/server/completion/completion-item-kind.js b/packages/language-server/server/completion/completion-item-kind.js
@@ -1,11 +1,11 @@
-const { ObjectType } = require("@hegel/core/type-graph/types/object-type");
-const { GenericType } = require("@hegel/core/type-graph/types/generic-type");
-const { FunctionType } = require("@hegel/core/type-graph/types/function-type");
+const { ObjectType } = require("@hegel/core/build/type-graph/types/object-type");
+const { GenericType } = require("@hegel/core/build/type-graph/types/generic-type");
+const { FunctionType } = require("@hegel/core/build/type-graph/types/function-type");
 const { CompletionItemKind } = require("vscode-languageserver");
 const {
   THIS_TYPE,
   CONSTRUCTABLE,
-} = require("@hegel/core/type-graph/constants");
+} = require("@hegel/core/build/type-graph/constants");
 
 /**
  * Find type kind of variable.

diff --git a/packages/language-server/server/validation/typings.js b/packages/language-server/server/validation/typings.js
@@ -1,5 +1,5 @@
-const { getConfig } = require("@hegel/cli/lib/config");
-const { importModule } = require("@hegel/cli/lib/module");
+const { getConfig } = require("@hegel/cli/build/lib/config");
+const { importModule } = require("@hegel/cli/build/lib/module");
 const { getBabylonAST } = require("../utils/document-ast");
 const { createGlobalScope } = require("@hegel/core");
 const { mixTypeDefinitions } = require("./type-definitions");

diff --git a/yarn.lock b/yarn.lock
@@ -1314,13 +1314,6 @@
   dependencies:
     "@hapi/hoek" "^8.3.0"
 
-"@hegel/[email protected]":
-  version "0.0.41"
-  resolved "https://registry.yarnpkg.com/@hegel/core/-/core-0.0.41.tgz#3a3cf914a28fdff0590c9eb3bca2719593e5cebd"
-  integrity sha512-T0dAV6Kcan25RfJrBuCUvmoWRYwjzp2PUefE8EfsUtnVXs3yQTh7QxlXbMIXuiYasNDCFN8Yf0x4xTMcnWhERQ==
-  dependencies:
-    "@babel/parser" "^7.8.4"
-
 "@hegel/[email protected]", "@hegel/typings@^0.0.41":
   version "0.0.41"
   resolved "https://registry.yarnpkg.com/@hegel/typings/-/typings-0.0.41.tgz#1d168c8155c1950dfe9a9fae42b7df7e373d842f"