chore: generate
This commit is contained in:
@@ -1229,11 +1229,7 @@ export const JDTLS: Info = {
|
|||||||
if (buildRoot) return buildRoot
|
if (buildRoot) return buildRoot
|
||||||
|
|
||||||
// 3. Maven: walk up pom.xml chain verifying <module> relationships
|
// 3. Maven: walk up pom.xml chain verifying <module> relationships
|
||||||
const pomFiles = await Filesystem.findUp(
|
const pomFiles = await Filesystem.findUp("pom.xml", path.dirname(file), ctx.directory)
|
||||||
"pom.xml",
|
|
||||||
path.dirname(file),
|
|
||||||
ctx.directory,
|
|
||||||
)
|
|
||||||
if (pomFiles.length > 0) {
|
if (pomFiles.length > 0) {
|
||||||
let root = path.dirname(pomFiles[0])
|
let root = path.dirname(pomFiles[0])
|
||||||
for (let i = 1; i < pomFiles.length; i++) {
|
for (let i = 1; i < pomFiles.length; i++) {
|
||||||
|
|||||||
@@ -93,7 +93,10 @@ describe("JDTLS.root", () => {
|
|||||||
const workspace = path.join(tmpBase, "nested-independent")
|
const workspace = path.join(tmpBase, "nested-independent")
|
||||||
await mkdirp(workspace)
|
await mkdirp(workspace)
|
||||||
// Parent pom WITHOUT <module>tools/sample</module>
|
// Parent pom WITHOUT <module>tools/sample</module>
|
||||||
await Bun.write(path.join(workspace, "pom.xml"), "<project><modules><module>module-a</module></modules></project>")
|
await Bun.write(
|
||||||
|
path.join(workspace, "pom.xml"),
|
||||||
|
"<project><modules><module>module-a</module></modules></project>",
|
||||||
|
)
|
||||||
// Independent project nested inside
|
// Independent project nested inside
|
||||||
const projectDir = path.join(workspace, "tools", "sample")
|
const projectDir = path.join(workspace, "tools", "sample")
|
||||||
await mkdirp(projectDir)
|
await mkdirp(projectDir)
|
||||||
@@ -446,16 +449,10 @@ describe("JDTLS.root", () => {
|
|||||||
await mkdirp(mavenSrc)
|
await mkdirp(mavenSrc)
|
||||||
await touch(path.join(mavenSrc, "MavenApp.java"))
|
await touch(path.join(mavenSrc, "MavenApp.java"))
|
||||||
|
|
||||||
const gradleResult = await LSPServer.JDTLS.root(
|
const gradleResult = await LSPServer.JDTLS.root(path.join(gradleSrc, "GradleApp.java"), makeCtx(workspace))
|
||||||
path.join(gradleSrc, "GradleApp.java"),
|
|
||||||
makeCtx(workspace),
|
|
||||||
)
|
|
||||||
expect(gradleResult).toBe(gradleDir)
|
expect(gradleResult).toBe(gradleDir)
|
||||||
|
|
||||||
const mavenResult = await LSPServer.JDTLS.root(
|
const mavenResult = await LSPServer.JDTLS.root(path.join(mavenSrc, "MavenApp.java"), makeCtx(workspace))
|
||||||
path.join(mavenSrc, "MavenApp.java"),
|
|
||||||
makeCtx(workspace),
|
|
||||||
)
|
|
||||||
expect(mavenResult).toBe(mavenDir)
|
expect(mavenResult).toBe(mavenDir)
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|||||||
Reference in New Issue
Block a user