surround with auto-closeable: ensure final is restored from existing var

otherwise with generateFinalLocals=true, non-final variables could be made final which leads to red code

java/java-tests/testData/codeInsight/surroundAutoCloseable/CommentsInVarDeclaration.java

@@ -6,6 +6,7 @@ class C {
     void m(File file) throws IOException {
         <caret>FileInputStream fileInputStream = new FileInputStream(file);
         String s = "initial value";//Non-NLS
-        String bar = s + fileInputStream.read();
+        s = s + fileInputStream.read();
+        s += "end";
     }
 }