Skip to content

Commit

Permalink
Removing duplicate import causes problems as some of the imports are…
Browse files Browse the repository at this point in the history
… needed as duplicate with use of ... as common etc (#919)
  • Loading branch information
PayalKhanna authored Feb 10, 2025
1 parent 5f43508 commit 484546e
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -126,14 +126,17 @@ class QuickFixTest extends AbstractRosettaLanguageServerTest {
]
]
}


//This feature to remove duplicate is removed temperately
@Test
def testResolveDuplicateImport() {
val model = '''
namespace foo.bar
import dsl.foo.*
import dsl.foo.*
import dsl.foo.* as foo
import dsl.foo.* as foo
import dsl.foo.*
import dsl.foo.*
func Bar:
inputs: foo Foo (1..1)
Expand All @@ -151,16 +154,16 @@ class QuickFixTest extends AbstractRosettaLanguageServerTest {
a int (1..1)
'''}
it.assertCodeActionResolution = [
assertEquals(1, size) //duplicate import
assertEquals(7, size) //duplicate import

val sorted = it.sortWith[a,b| ru.comparePositions(a.diagnostics.head.range.start, b.diagnostics.head.range.start)]

sorted.get(0) => [
assertEquals("Optimize imports", title)
edit.changes.values.head.head => [
assertEquals("import dsl.foo.*", newText) // second import is deleted
assertEquals("import dsl.foo.* as foo\nimport dsl.foo.* as foo\nimport dsl.foo.*\nimport dsl.foo.*", newText) // second import is deleted
assertEquals(new Position(2, 0), range.start)
assertEquals(new Position(3, 16), range.end)
assertEquals(new Position(5, 24), range.end)
]
]
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,10 @@ public void cleanupImports(RosettaModel model) {
/*List<Import> unusedImports = findUnused(model);
imports.removeAll(unusedImports);*/

List<Import> duplicateImports = findDuplicates(imports);
imports.removeAll(duplicateImports);
//Removing duplicate import causes problems as some of the imports are needed
//as duplicate with use of ... as common etc
/*List<Import> duplicateImports = findDuplicates(imports);
imports.removeAll(duplicateImports);*/

sortImports(imports);
}
Expand Down

0 comments on commit 484546e

Please sign in to comment.