Skip to content

Commit 2bdcb42

Browse files
committed
rename
1 parent e59b002 commit 2bdcb42

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

server/src/server.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,20 +65,21 @@ let codeActionsFromDiagnostics: codeActions.filesCodeActions = {};
6565
// will be properly defined later depending on the mode (stdio/node-rpc)
6666
let send: (msg: p.Message) => void = (_) => {};
6767

68+
let getBinaryPath = (projectRootPath: p.DocumentUri) =>
69+
extensionConfiguration.binaryPath === null
70+
? path.join(projectRootPath, c.nodeModulesBinDir)
71+
: extensionConfiguration.binaryPath;
72+
6873
let findRescriptBinary = (projectRootPath: p.DocumentUri) =>
6974
extensionConfiguration.binaryPath === null
70-
? utils.findBuildBinaryFromProjectRoot(projectRootPath)
75+
? utils.findRescriptBinaryFromProjectRoot(projectRootPath)
7176
: utils.findBuildBinaryFromConfig(extensionConfiguration.binaryPath);
7277

7378
let findBscBinary = (filePath: p.DocumentUri) =>
7479
extensionConfiguration.binaryPath === null
7580
? utils.findBscBinaryFromProjectRoot(filePath)
7681
: utils.findBscBinaryFromConfig(extensionConfiguration.binaryPath);
7782

78-
let getBinaryPath = (projectRootPath: p.DocumentUri) =>
79-
extensionConfiguration.binaryPath === null
80-
? path.join(projectRootPath, c.nodeModulesBinDir)
81-
: extensionConfiguration.binaryPath;
8283

8384
interface CreateInterfaceRequestParams {
8485
uri: string;

server/src/utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ export let findBuildBinaryFromConfig = (
7979
) =>
8080
findBuildBinaryBase(path.join(pathToBinaryDirFromConfig, c.rescriptBinName));
8181

82-
export let findBuildBinaryFromProjectRoot = (projectRootPath: p.DocumentUri) =>
82+
export let findRescriptBinaryFromProjectRoot = (projectRootPath: p.DocumentUri) =>
8383
findBuildBinaryBase(path.join(projectRootPath, c.rescriptNodePartialPath));
8484

8585
type execResult =

0 commit comments

Comments
 (0)