diff --git a/rosetta-ide/src/test/java/com/regnosys/rosetta/ide/quickfix/QuickFixTest.xtend b/rosetta-ide/src/test/java/com/regnosys/rosetta/ide/quickfix/QuickFixTest.xtend index 72feb7be2..f52ad9cb6 100644 --- a/rosetta-ide/src/test/java/com/regnosys/rosetta/ide/quickfix/QuickFixTest.xtend +++ b/rosetta-ide/src/test/java/com/regnosys/rosetta/ide/quickfix/QuickFixTest.xtend @@ -237,7 +237,7 @@ class QuickFixTest extends AbstractRosettaLanguageServerTest { sorted.get(0)=> [ assertEquals("Optimize imports", title) edit.changes.values.head.head => [ - assertEquals("import dsl.foo.*", newText) // second import is deleted + assertEquals("import dsl.bar.*\nimport dsl.foo.*", newText) // second import is deleted assertEquals(new Position(2, 0), range.start) assertEquals(new Position(3, 16), range.end) ] diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/utils/ImportManagementService.java b/rosetta-lang/src/main/java/com/regnosys/rosetta/utils/ImportManagementService.java index fcf45c6c5..bc29ba6f5 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/utils/ImportManagementService.java +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/utils/ImportManagementService.java @@ -31,9 +31,10 @@ public class ImportManagementService { public void cleanupImports(RosettaModel model) { EList imports = model.getImports(); + //TODO need to rework on findUnused so that it can work on parent model imports as well // remove all duplicate/unused imports - List unusedImports = findUnused(model); - imports.removeAll(unusedImports); + /*List unusedImports = findUnused(model); + imports.removeAll(unusedImports);*/ List duplicateImports = findDuplicates(imports); imports.removeAll(duplicateImports);