Skip to content

Commit ce51fac

Browse files
committed
chasing upstream
1 parent ffd4893 commit ce51fac

File tree

4 files changed

+5
-2
lines changed

4 files changed

+5
-2
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22
out
33
node_modules
44
client/server
5-
.vscode-test
5+
.vscode-test
6+
**/*.vsix

rescript-vscode-0.0.8.vsix

-608 KB
Binary file not shown.

server/src/RescriptEditorSupport.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { fileURLToPath } from "url";
22
import { RequestMessage } from "vscode-languageserver";
33
import * as utils from "./utils";
4+
import * as project from "./project";
45
import * as path from "path";
56
import { exec } from "child_process";
67
import fs from "fs";
@@ -15,7 +16,7 @@ export let binaryExists = fs.existsSync(binaryPath);
1516

1617
let findExecutable = (uri: string) => {
1718
let filePath = fileURLToPath(uri);
18-
let projectRootPath = utils.findProjectRootOfFile(filePath);
19+
let projectRootPath = project.findBscPath(filePath);
1920
if (projectRootPath == null || !binaryExists) {
2021
return null;
2122
} else {

server/src/utils.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import * as p from "vscode-languageserver-protocol";
55
import * as t from "vscode-languageserver-types";
66
import fs from "fs";
77
import * as os from "os";
8+
import path from "path";
89

910
let tempFilePrefix = "rescript_format_file_" + process.pid + "_";
1011
let tempFileId = 0;

0 commit comments

Comments
 (0)