Add likely project root as fallback cwd

lib/index.js

@@ -32,10 +32,10 @@
  */
 
 import path from 'node:path'
-import process from 'node:process'
 import {PassThrough} from 'node:stream'
 import {URL, pathToFileURL, fileURLToPath} from 'node:url'
 
+import {findUp, pathExists} from 'find-up'
 import {loadPlugin} from 'load-plugin'
 import {engine} from 'unified-engine'
 import {VFile} from 'vfile'
@@ -139,10 +139,15 @@ function vfileMessageToDiagnostic(message) {
  * Convert language server protocol text document to a vfile.
  *
  * @param {TextDocument} document
+ * @param {string} cwd
  * @returns {VFile}
  */
-function lspDocumentToVfile(document) {
-  return new VFile({path: new URL(document.uri), value: document.getText()})
+function lspDocumentToVfile(document, cwd) {
+  return new VFile({
+    cwd,
+    path: new URL(document.uri),
+    value: document.getText()
+  })
 }
 
 /**
@@ -179,32 +184,60 @@ export function configureUnifiedLanguageServer(
   async function processDocuments(textDocuments, alwaysStringify = false) {
     // LSP uses `file:` URLs (hrefs), `unified-engine` expects a paths.
     // `process.cwd()` does not add a final slash, but `file:` URLs often do.
-    const workspacesAsPaths = [...workspaces].map((d) =>
-      fileURLToPath(d.replace(/\/$/, ''))
-    )
+    const workspacesAsPaths = [...workspaces]
+      .map((d) => d.replace(/[/\\]?$/, ''))
+      // Sort the longest (closest to the file) first.
+      .sort((a, b) => b.length - a.length)
     /** @type {Map<string, Array<VFile>>} */
     const workspacePathToFiles = new Map()
 
-    if (workspacesAsPaths.length === 0) {
-      workspacesAsPaths.push(process.cwd())
-    }
+    await Promise.all(
+      textDocuments.map(async (textDocument) => {
+        /** @type {string | undefined} */
+        let cwd
+        if (workspaces.size === 0) {
+          cwd = await findUp(
+            async (dir) => {
+              const pkgExists = await pathExists(path.join(dir, 'package.json'))
+              if (pkgExists) {
+                return dir
+              }
 
-    for (const textDocument of textDocuments) {
-      const file = lspDocumentToVfile(textDocument)
-      const [cwd] = workspacesAsPaths
-        // Every workspace that includes the document.
-        .filter((d) => file.path.slice(0, d.length + 1) === d + path.sep)
-        // Sort the longest (closest to the file) first.
-        .sort((a, b) => b.length - a.length)
-
-      // This presumably should not occur: a file outside a workspace.
-      // So ignore the file.
-      /* c8 ignore next */
-      if (!cwd) continue
-
-      const files = workspacePathToFiles.get(cwd) || []
-      workspacePathToFiles.set(cwd, [...files, file])
-    }
+              const gitExists = await pathExists(path.join(dir, '.git'))
+              // Git doesn’t allow us to commit files in a .git folder.
+              /* c8 ignore start */
+              if (gitExists) {
+                return dir
+              }
+              /* c8 ignore stop */
+            },
+            {
+              cwd: path.dirname(fileURLToPath(textDocument.uri)),
+              type: 'directory'
+            }
+          )
+        } else {
+          // Because the workspaces are sorted longest to shortest, the first
+          // match is closest to the file.
+          const ancestor = workspacesAsPaths.find((d) =>
+            textDocument.uri.startsWith(d + '/')
+          )
+          if (ancestor) {
+            cwd = fileURLToPath(ancestor)
+          }
+        }
+
+        // This presumably should not occur: a file outside a workspace.
+        // So ignore the file.
+        /* c8 ignore next */
+        if (!cwd) return
+
+        const file = lspDocumentToVfile(textDocument, cwd)
+
+        const files = workspacePathToFiles.get(cwd) || []
+        workspacePathToFiles.set(cwd, [...files, file])
+      })
+    )
 
     /** @type {Array<Promise<Array<VFile>>>} */
     const promises = []
@@ -308,7 +341,7 @@ export function configureUnifiedLanguageServer(
 
     for (const file of files) {
       // VFile uses a file path, but LSP expects a file URL as a string.
-      const uri = String(pathToFileURL(file.path))
+      const uri = String(pathToFileURL(path.resolve(file.cwd, file.path)))
       connection.sendDiagnostics({
         uri,
         version: documentVersions.get(uri),

package.json

@@ -34,6 +34,7 @@
   ],
   "dependencies": {
     "@types/unist": "^2.0.0",
+    "find-up": "^6.0.0",
     "load-plugin": "^4.0.0",
     "unified-engine": "^9.0.0",
     "vfile": "^5.0.0",

test/index.js

@@ -15,7 +15,7 @@ import * as exports from 'unified-language-server'
 
 const sleep = promisify(setTimeout)
 
-const delay = process.platform === 'win32' ? 800 : 400
+const delay = process.platform === 'win32' ? 1000 : 400
 const timeout = 10_000
 
 test('exports', (t) => {
@@ -890,8 +890,8 @@ test('`textDocument/codeAction` (and diagnostics)', async (t) => {
 
 test('`initialize` w/ nothing', async (t) => {
   const stdin = new PassThrough()
-  const cwd = new URL('.', import.meta.url)
-  const promise = execa('node', ['remark-with-cwd.js', '--stdio'], {
+  const cwd = new URL('..', import.meta.url)
+  const promise = execa('node', ['./test/remark-with-cwd.js', '--stdio'], {
     cwd: fileURLToPath(cwd),
     input: stdin,
     timeout

test/remark-with-error.js

@@ -3,5 +3,6 @@ import {createUnifiedLanguageServer} from '../index.js'
 createUnifiedLanguageServer({
   processorName: 'remark',
   processorSpecifier: 'remark',
-  plugins: ['./one-error.js']
+  // This is resolved from the directory containing package.json
+  plugins: ['./test/one-error.js']
 })

test/remark-with-warnings.js

@@ -3,5 +3,6 @@ import {createUnifiedLanguageServer} from '../index.js'
 createUnifiedLanguageServer({
   processorName: 'remark',
   processorSpecifier: 'remark',
-  plugins: ['./lots-of-warnings.js']
+  // This is resolved from the directory containing package.json
+  plugins: ['./test/lots-of-warnings.js']
 })