New feature: allow spoon to do static imports for methods and fields #1040

surli · 2016-12-13T16:08:05Z

Improve ImportScannerImpl to allow Spoon to do static imports.
Change the interface of ImportScanner to return list of CtReference when doing computeImports.

Lots of tests had to be changed as with autoImports it automatically imports all static elements.

…riable

…into martin

…ith an or instead of an and. Now the test is failing, proof that the assertion is checked :)

… a local variable in the same block or by a field (or a variable in another block). First detection implemented but patch not satisfying.

…sing autoimport

…rus/spoon into martin" This reverts commit 2609284, reversing changes made to 49d6e68.

…operties. Some choices have been done concerning some set methods in order to pass the test we should discuss.

Fix conflicts by solving imports.

… set to true or when it is set to false. When set to false, the scanner will detect name conflict and automatically import necessary types.

Solve conflict.

Solve in using version of inria/master

…n the merge...

…ble mode. Also improve tests. Related to #1027

…rts.

…rtScannerImpl. Fix one test but failed lot others. Still working.

…e parent class name if not imported.

tdurieux · 2016-12-14T06:36:34Z

src/main/java/spoon/reflect/visitor/ImportScannerImpl.java

 }

 @Override
 public void computeImports(CtElement element) {
- imports.clear();
+ classImports.clear();


You have to clear the 3 lists

Agreed. I push the change.

monperrus · 2016-12-14T08:19:39Z

cool!

in Spoon, we aim at maximum backward compatibility and not to change the signature public methods, esp. in interfaces.

to this extent, I propose to keep computeImports as is and to introduce a new method (eg computeAllImports).

this will greatly reduce the impact in the tests (and in client code also).

(fortunately isImported(CtReference ref) is backward compatible)

monperrus · 2016-12-14T08:20:40Z

src/test/java/spoon/test/variable/AccessFullyQualifiedFieldTest.java

@@ -32,7 +32,7 @@ public void testCheckAssignmentContracts() throws Exception {

 private String buildResourceAndReturnResult(String pathResource, String output) {
 Launcher spoon = new Launcher();
- //spoon.setArgs(new String[]{"--with-imports"});
+ //spoon.setArgs(new String[]{"--with-classImports"});


wrong refactoring?

Uh. Yes, I may have done it a bit fast. Apparently I leave some occurences also in comments. I will fix that.

surli · 2016-12-14T08:34:02Z

to this extent, I propose to keep computeImports as is and to introduce a new method (eg computeAllImports).
this will greatly reduce the impact in the tests (and in client code also).

Ok but then DefaultJavaPrettyPrinter will use the computeAllImports, right?

@monperrus

…e interface ImportScanner for backward compatibility reason as suggested by @monperrus

…atic field. Change test according that. #1027

surli · 2016-12-14T15:56:13Z

src/test/java/spoon/test/fieldaccesses/FieldAccessTest.java

 assertEquals("A.myField", aClass.getElements(new TypeFilter<>(CtFieldWrite.class)).get(0).toString());
- assertEquals("finalField", aClass.getElements(new TypeFilter<>(CtFieldWrite.class)).get(1).toString());
+ assertEquals("B.finalField", aClass.getElements(new TypeFilter<>(CtFieldWrite.class)).get(1).toString());


surli · 2016-12-14T15:57:19Z

src/test/java/spoon/test/imports/ImportTest.java


 assertEquals(2, imports.size());
 Set<String> expectedImports = new HashSet<>(
 Arrays.asList("spoon.test.imports.testclasses.internal3.Foo", "java.io.File"));
- Set<String> actualImports = imports.stream().map(CtTypeReference::toString).collect(Collectors.toSet());
+ Set<String> actualImports = imports.stream().map(CtReference::toString).collect(Collectors.toSet());


Undo change

surli · 2016-12-14T15:57:26Z

src/test/java/spoon/test/prettyprinter/QualifiedThisRefTest.java

@@ -51,7 +52,7 @@ public void setup() throws Exception {
 public void testQualifiedThisRef() {
 DefaultJavaPrettyPrinter printer = new DefaultJavaPrettyPrinter(factory.getEnvironment());
 CtType<?> ctClass = factory.Type().get(QualifiedThisRef.class);
- Collection<CtTypeReference<?>> imports = printer.computeImports(ctClass);
+ Collection<CtReference> imports = printer.computeImports(ctClass);


Undo change

In fact this one should remain the same as it's the method computeImports from DefaultJavaPrettyPrinter (not defined in any interface) which must return CtReference because it calls computeAllImports from ImportScanner.

surli · 2016-12-14T15:58:26Z

src/test/java/spoon/test/targeted/TargetedExpressionTest.java

- assertEqualsFieldAccess(new ExpectedTargetedExpression().type(CtFieldWrite.class).declaringType(expectedType).target(expectedTypeAccess).result("p"), staticElements.get(0));
+
+ // Changing behaviour when writing static field, it is now writed using the class name
+ assertEqualsFieldAccess(new ExpectedTargetedExpression().type(CtFieldWrite.class).declaringType(expectedType).target(expectedTypeAccess).result("Foo.p"), staticElements.get(0));


Undo change

surli · 2016-12-15T09:04:46Z

Ok to merge this now @monperrus ?

monperrus and others added 30 commits November 16, 2016 22:28

bug: no fully qualified name if top package is shadowed by a local va…

9694ff9

…riable

Merge branch 'bug-static-import' of https://github.com/monperrus/spoon …

2609284

…into martin

Proposal to fix #972: apparently a condition was improperly checked w…

30363db

…ith an or instead of an and. Now the test is failing, proof that the assertion is checked :)

WiP #980: create two tests to check case when the name is shadowed by…

c05c638

… a local variable in the same block or by a field (or a variable in another block). First detection implemented but patch not satisfying.

WiP #980: first naive fix when the shadowed variable is a field, by u…

5bf26f5

…sing autoimport

WiP #980 New tests and scanner for variables

a0a1329

Revert "Merge branch 'bug-static-import' of https://github.com/monper…

0b5371d

…rus/spoon into martin" This reverts commit 2609284, reversing changes made to 49d6e68.

Fix #972 and subsequent tests. Add a condition to ignore unsettablePr…

c9fe205

…operties. Some choices have been done concerning some set methods in order to pass the test we should discuss.

Merge remote-tracking branch 'inria/master' into pr#972

7f504d5

Fix conflicts by solving imports.

Fix unused import

a30611b

Proposal to fix #980: a different scanner is used when autoimports is…

2c7b4d3

… set to true or when it is set to false. When set to false, the scanner will detect name conflict and automatically import necessary types.

Two more tests added to check if #980 is really fixed. Works fine.

5614297

Merge branch 'pr#972' into issue980

013d5d9

Solve conflict.

Static import are not supported yet. Test case to show it.

e7c9b0d

Merge branch 'master' of https://github.com/INRIA/spoon

3155d12

Fix locally checkstyle for ParentExiter

3b0a416

Merge branch 'master' of https://github.com/INRIA/spoon

e81c26b

Solve in using version of inria/master

Merge branch 'master' of https://github.com/INRIA/spoon

cae9260

Merge branch 'master' into bugStaticImport

e0b23ab

Create new tests to show issue #1027

0ee080f

Was renamed MinimalImportScanner in previous commit but not deleted i…

4ae8cf7

…n the merge...

Begin of the refactoring to import static fields and methods in reada…

6561ee7

…ble mode. Also improve tests. Related to #1027

Fix compilation issues with the change of signature of computeImports

cc962a0

Fix lot of things to manage correctly readable mode with statics impo…

2d57b50

…rts.

Fix some tests and avoid redundancy in imports. #1027

73d0ee9

WiP #1027 Fix some errors by doing more tests when adding imports

bdeef55

WiP #1027 Fix ambiguity between getXXImports and addXXImports in Impo…

99855a0

…rtScannerImpl. Fix one test but failed lot others. Still working.

WiP #1027 Fix some tests regarding class import

350920a

WiP #1027: still working to pass all tests for this feature

512e32c

WiP #1027 Change the behaviour to write static fields, now it uses th…

7800b56

…e parent class name if not imported.

surli and others added 4 commits December 12, 2016 17:43

WiP #1027 One more test to manage java.lang when printing FQN

715b62e

Fix last tests for #1027. Fix checkstyle issues as well.

6c5a5b2

Merge branch 'master' of https://github.com/INRIA/spoon

f37484f

Merge branch 'master' into bugStaticImport

3f5f475

tdurieux reviewed Dec 14, 2016

View reviewed changes

Clear all lists for #1027

bb70bb5

monperrus reviewed Dec 14, 2016

View reviewed changes

surli added 3 commits December 14, 2016 10:51

Feature #1027: delete mentions of classImports in comments. Change th…

3b1bf4c

…e interface ImportScanner for backward compatibility reason as suggested by @monperrus

Also have to clear all list in computeImports #1027

cc0ec5b

Revert some changes to force the add of classtype before calling a st…

859928d

…atic field. Change test according that. #1027

surli commented Dec 15, 2016

View reviewed changes

monperrus merged commit adb2fd7 into INRIA:master Dec 15, 2016

tdurieux mentioned this pull request Jan 4, 2017

Release 5.5.0 planned for Wednesday Jan 11th 2017 #1081

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

New feature: allow spoon to do static imports for methods and fields #1040

New feature: allow spoon to do static imports for methods and fields #1040

surli commented Dec 13, 2016

tdurieux Dec 14, 2016

surli Dec 14, 2016

monperrus commented Dec 14, 2016

monperrus Dec 14, 2016

surli Dec 14, 2016

surli commented Dec 14, 2016

surli Dec 14, 2016

surli Dec 14, 2016

surli Dec 14, 2016

surli Dec 15, 2016

surli Dec 14, 2016

surli commented Dec 15, 2016

New feature: allow spoon to do static imports for methods and fields #1040

New feature: allow spoon to do static imports for methods and fields #1040

Conversation

surli commented Dec 13, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

monperrus commented Dec 14, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

surli commented Dec 14, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

surli commented Dec 15, 2016