some reorganization

Author: BlueHotDog

server/src/fs_helpers.ts

@@ -0,0 +1,19 @@
+import * as Path from "path";
+import Fs from "fs";
+
+export let findPathRec = (
+	currentPath: string,
+	targetPath: string
+): null | string => {
+	let baseDir = Path.dirname(currentPath);
+	if (Fs.existsSync(Path.join(baseDir, targetPath))) {
+		return baseDir;
+	} else {
+		if (baseDir === currentPath) {
+			// reached top
+			return null;
+		} else {
+			return findPathRec(baseDir, targetPath);
+		}
+	}
+};

server/src/project.ts

@@ -0,0 +1,29 @@
+import * as LSP from "vscode-languageserver-protocol";
+import * as FsHelpers from "./fs_helpers";
+import * as Const from "./constants";
+import * as Path from "path";
+
+// TODO: races here?
+// TODO: this doesn't handle file:/// scheme
+export let rootByPath = (
+	source: LSP.DocumentUri
+): null | LSP.DocumentUri => {
+	return FsHelpers.findPathRec(source, Const.bscPartialPath);
+};
+
+export let bscPath = (source: LSP.DocumentUri): LSP.DocumentUri => Path.join(source, Const.bscPartialPath);
+
+export let findBscPath = (
+	source: LSP.DocumentUri
+): null | LSP.DocumentUri => {
+	let rootPath = rootByPath(source);
+	return rootPath == null ? null : bscPath(rootPath);
+}
+
+// the "build root" represents the nearest directory containing a "bsconfig.json" file.
+// "bsconfig.json" can be used to locate the nearest build artifacts
+export let findBuildRoot = (
+	source: LSP.DocumentUri
+): null | LSP.DocumentUri => {
+	return FsHelpers.findPathRec(source, Const.bsconfigPartialPath);
+};

server/src/server.ts

@@ -2,6 +2,7 @@ import process from "process";
 import * as p from "vscode-languageserver-protocol";
 import * as t from "vscode-languageserver-types";
 import * as j from "vscode-jsonrpc";
+import * as Project from "./project";
 import * as m from "vscode-jsonrpc/lib/messages";
 import * as v from "vscode-languageserver";
 import * as path from "path";
@@ -121,7 +122,7 @@ let openedFile = (fileUri: string, fileContent: string) => {
 
   stupidFileContentCache.set(filePath, fileContent);
 
-  let buildRootPath = utils.findBuildRootOfFile(filePath);
+  let buildRootPath = Project.findBuildRoot(filePath);
   if (buildRootPath != null) {
     if (!projectsFiles.has(buildRootPath)) {
       projectsFiles.set(buildRootPath, {
@@ -140,7 +141,7 @@ let openedFile = (fileUri: string, fileContent: string) => {
     // because otherwise the diagnostics info we'll display might be stale
     let bsbLockPath = path.join(buildRootPath, c.bsbLock);
     if (firstOpenFileOfProject && !fs.existsSync(bsbLockPath)) {
-      let bsbPath = path.join(buildRootPath, c.bsbPartialPath);
+      let bsbPath = Project.bscPath(buildRootPath);
       // TODO: sometime stale .bsb.lock dangling. bsb -w knows .bsb.lock is
       // stale. Use that logic
       // TODO: close watcher when lang-server shuts down
@@ -178,7 +179,7 @@ let closedFile = (fileUri: string) => {
 
   stupidFileContentCache.delete(filePath);
 
-  let buildRootPath = utils.findBuildRootOfFile(filePath);
+  let buildRootPath = Project.findBuildRoot(filePath);
   if (buildRootPath != null) {
     let root = projectsFiles.get(buildRootPath);
     if (root != null) {
@@ -371,8 +372,8 @@ process.on("message", (msg: m.Message) => {
         process.send!(fakeSuccessResponse);
         process.send!(response);
       } else {
-        let projectRootPath = utils.findProjectRootOfFile(filePath);
-        if (projectRootPath == null) {
+        let bscPath = Project.findBscPath(filePath);
+        if (bscPath == null) {
           let params: p.ShowMessageParams = {
             type: p.MessageType.Error,
             message: `Cannot find a nearby ${c.bscPartialPath}. It's needed for determining the project's root.`,
@@ -385,7 +386,6 @@ process.on("message", (msg: m.Message) => {
           process.send!(fakeSuccessResponse);
           process.send!(response);
         } else {
-          let bscPath = path.join(projectRootPath, c.bscPartialPath);
           if (!fs.existsSync(bscPath)) {
             let params: p.ShowMessageParams = {
               type: p.MessageType.Error,

server/src/utils.ts

@@ -2,47 +2,10 @@ import { Range } from "vscode-languageserver-textdocument";
 import * as c from "./constants";
 import * as childProcess from "child_process";
 import * as p from "vscode-languageserver-protocol";
-import * as path from "path";
 import * as t from "vscode-languageserver-types";
 import * as tmp from "tmp";
 import fs from "fs";
 
-// TODO: races here?
-// TODO: this doesn't handle file:/// scheme
-export let findProjectRootOfFile = (
-	source: p.DocumentUri
-): null | p.DocumentUri => {
-	let dir = path.dirname(source);
-	if (fs.existsSync(path.join(dir, c.bscPartialPath))) {
-		return dir;
-	} else {
-		if (dir === source) {
-			// reached top
-			return null;
-		} else {
-			return findProjectRootOfFile(dir);
-		}
-	}
-};
-
-// the "build root" represents the nearest directory containing a "bsconfig.json" file.
-// "bsconfig.json" can be used to locate the nearest build artefacts
-export let findBuildRootOfFile = (
-	source: p.DocumentUri
-): null | p.DocumentUri => {
-	let dir = path.dirname(source);
-	if (fs.existsSync(path.join(dir, c.bsconfigPartialPath))) {
-		return dir;
-	} else {
-		if (dir === source) {
-			// reached top
-			return null;
-		} else {
-			return findBuildRootOfFile(dir);
-		}
-	}
-};
-
 type execResult =
 	| {
 		kind: "success";