Suppress/avoid a redundant variable warning when injecting a Java expression (#112)

Author: unshare

src/main/java/org/mapstruct/intellij/expression/JavaExpressionInjector.java

@@ -216,7 +216,8 @@ else if ( resolved instanceof PsiParameter ) {
             if ( appendTypeParametersHard( prefixBuilder, imports, method.getTypeParameters() ) ) {
                 prefixBuilder.append( " " );
             }
-            prefixBuilder.append( "void __test__(\n" );
+            appendType( prefixBuilder, imports, targetType );
+            prefixBuilder.append( " __test__(\n" );
 
             PsiParameter[] parameters = method.getParameterList().getParameters();
             for ( int i = 0; i < parameters.length; i++ ) {
@@ -239,8 +240,7 @@ else if ( resolved instanceof PsiParameter ) {
             appendNesting( prefixBuilder, 1 );
             prefixBuilder.append( ") {\n" );
             appendNesting( prefixBuilder, 2 );
-            appendType( prefixBuilder, imports, targetType );
-            prefixBuilder.append( " __target__ = " );
+            prefixBuilder.append( "return " );
 
             PsiAnnotation mapper = mapperClass.getAnnotation( MapstructUtil.MAPPER_ANNOTATION_FQN );
             if ( mapper != null ) {

src/test/java/org/mapstruct/intellij/expression/JavaExpressionInjectionTest.java

@@ -304,10 +304,10 @@ protected void withMapperWithImports(String attribute) {
             "abstract class CarMapperImpl\n" +
             "    implements CarMapper {\n" +
             "\n" +
-            "    void __test__(\n" +
+            "    String __test__(\n" +
             "        Car car\n" +
             "    ) {\n" +
-            "        String __target__ = Collections;\n" +
+            "        return Collections;\n" +
             "    }\n" +
             "}" );
 
@@ -332,10 +332,10 @@ protected void withMapperWithCustomImports(String attribute) {
             "abstract class CarMapperImpl\n" +
             "    implements CarMapper {\n" +
             "\n" +
-            "    void __test__(\n" +
+            "    String __test__(\n" +
             "        Car car\n" +
             "    ) {\n" +
-            "        String __target__ = Utils;\n" +
+            "        return Utils;\n" +
             "    }\n" +
             "}" );
     }
@@ -358,10 +358,10 @@ protected void withMapperWithoutImports(String attribute) {
             "abstract class CarMapperImpl\n" +
             "    implements CarMapper {\n" +
             "\n" +
-            "    void __test__(\n" +
+            "    String __test__(\n" +
             "        Car car\n" +
             "    ) {\n" +
-            "        String __target__ = Collections;\n" +
+            "        return Collections;\n" +
             "    }\n" +
             "}" );
 
@@ -385,11 +385,11 @@ protected void withMultiSourceParameters(String attribute) {
             "abstract class CarMapperImpl\n" +
             "    implements CarMapper {\n" +
             "\n" +
-            "    void __test__(\n" +
+            "    String __test__(\n" +
             "        Car car,\n" +
             "        String make\n" +
             "    ) {\n" +
-            "        String __target__ = car.;\n" +
+            "        return car.;\n" +
             "    }\n" +
             "}" );
     }
@@ -414,10 +414,10 @@ protected void withGenericSourceParameters(String attribute) {
             "abstract class CarMapperImpl\n" +
             "    implements CarMapper {\n" +
             "\n" +
-            "    void __test__(\n" +
+            "    String __test__(\n" +
             "        Wrapper<Car> carWrapper\n" +
             "    ) {\n" +
-            "        String __target__ = carWrapper.getValue().;\n" +
+            "        return carWrapper.getValue().;\n" +
             "    }\n" +
             "}" );
     }
@@ -442,11 +442,11 @@ protected void withExpressionWithSourceParameterWithAnnotations(String attribute
             "abstract class CarMapperImpl\n" +
             "    implements CarMapper {\n" +
             "\n" +
-            "    void __test__(\n" +
+            "    String __test__(\n" +
             "        @Context\n" +
             "        Wrapper<Car> carWrapper\n" +
             "    ) {\n" +
-            "        String __target__ = carWrapper.getValue().;\n" +
+            "        return carWrapper.getValue().;\n" +
             "    }\n" +
             "}" );
     }
@@ -472,10 +472,10 @@ protected void withExpressionWithSourceParameterWithMultipleGenerics(String attr
             "abstract class CarMapperImpl\n" +
             "    implements CarMapper {\n" +
             "\n" +
-            "    void __test__(\n" +
+            "    String __test__(\n" +
             "        Wrapper<BiFunction<String, Number, Car>> carWrapper\n" +
             "    ) {\n" +
-            "        String __target__ = carWrapper.getValue().apply(null, null).;\n" +
+            "        return carWrapper.getValue().apply(null, null).;\n" +
             "    }\n" +
             "}" );
     }
@@ -498,10 +498,10 @@ protected void withExpressionWithGenericMethod(String attribute) {
             "abstract class CarMapperImpl\n" +
             "    implements CarMapper {\n" +
             "\n" +
-            "    <T extends Number> void __test__(\n" +
+            "    <T extends Number> int __test__(\n" +
             "        NumberWrapper<T> numberWrapper\n" +
             "    ) {\n" +
-            "        int __target__ = numberWrapper.;\n" +
+            "        return numberWrapper.;\n" +
             "    }\n" +
             "}" );
     }
@@ -524,11 +524,11 @@ protected void withGenericMapper(String attribute) {
             "abstract class CarMapperImpl<T, R>\n" +
             "    implements CarMapper<T, R> {\n" +
             "\n" +
-            "    void __test__(\n" +
+            "    String __test__(\n" +
             "        Car car,\n" +
             "        String make\n" +
             "    ) {\n" +
-            "        String __target__ = car.;\n" +
+            "        return car.;\n" +
             "    }\n" +
             "}" );
     }
@@ -559,10 +559,10 @@ protected void withClassMapper(String attribute) {
             "abstract class CarMapperImpl\n" +
             "    extends CarMapper {\n" +
             "\n" +
-            "    void __test__(\n" +
+            "    String __test__(\n" +
             "        Car car\n" +
             "    ) {\n" +
-            "        String __target__ = car.;\n" +
+            "        return car.;\n" +
             "    }\n" +
             "}" );
     }
@@ -594,10 +594,10 @@ protected void withTargetUsingStaticString(String attribute) {
             "abstract class CarMapperImpl\n" +
             "    extends CarMapper {\n" +
             "\n" +
-            "    void __test__(\n" +
+            "    String __test__(\n" +
             "        Car car\n" +
             "    ) {\n" +
-            "        String __target__ = car.;\n" +
+            "        return car.;\n" +
             "    }\n" +
             "}" );
     }