diff --git a/rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/rascal/RascalLanguageServices.java b/rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/rascal/RascalLanguageServices.java index 17c02949..92528f4d 100644 --- a/rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/rascal/RascalLanguageServices.java +++ b/rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/rascal/RascalLanguageServices.java @@ -310,7 +310,7 @@ public CompletableFuture getModuleRenames(List fileRenames, throw new RuntimeException(e.getMessage()); } }, emptyResult, exec, false, client).get(); - }); + }); } diff --git a/rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/rascal/RascalTextDocumentService.java b/rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/rascal/RascalTextDocumentService.java index 71133d8a..c4436e5c 100644 --- a/rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/rascal/RascalTextDocumentService.java +++ b/rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/rascal/RascalTextDocumentService.java @@ -41,6 +41,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; +import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.checkerframework.checker.nullness.qual.MonotonicNonNull; diff --git a/rascal-vscode-extension/src/test/vscode-suite/ide.test.ts b/rascal-vscode-extension/src/test/vscode-suite/ide.test.ts index 51614983..3fa51a49 100644 --- a/rascal-vscode-extension/src/test/vscode-suite/ide.test.ts +++ b/rascal-vscode-extension/src/test/vscode-suite/ide.test.ts @@ -196,11 +196,13 @@ describe('IDE', function () { const workspace = await explorer.getContent().getSection("test (Workspace)"); await workspace.expand(); await ide.openModule(TestWorkspace.libFile); - const libFileInTree = await driver.wait(async() => workspace.findItem("Lib.rsc"), Delays.normal, "Cannot find Lib.rsc"); - const libFolderInTree = await driver.wait(async() => workspace.findItem("lib"), Delays.normal, "Cannot find lib folder"); + const libFileInTree = await driver.wait(async() => workspace.findItem("Lib.rsc"), Delays.extremelySlow, "Cannot find Lib.rsc"); + const libFolderInTree = await driver.wait(async() => workspace.findItem("lib"), Delays.extremelySlow, "Cannot find lib folder"); + + // Open the lib file before moving it, so we have the editor ready to inspect afterwards + const libFile = await ide.openModule(TestWorkspace.libFile); await driver.actions().dragAndDrop(libFileInTree!, libFolderInTree).perform(); - const libFile = await ide.openModule(path.join(newDir, "Lib.rsc")); await driver.wait(async() => { const text = await libFile.getText(); return text.indexOf("module lib::Lib") !== -1;