inplace introduce: do not touch next field type; fix introduce over local variable with initializer; tests

This commit is contained in:
anna
2011-06-29 17:05:22 +04:00
parent 7214e19e0c
commit 04c88b7765
18 changed files with 407 additions and 213 deletions

View File

@@ -0,0 +1,21 @@
/*
* Copyright 2000-2011 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
class Test {
void simpleMethod() {
System.out.println("<caret>");
System.out.println("");
}
}

View File

@@ -0,0 +1,20 @@
/*
* Copyright 2000-2011 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
class Test {
void simpleMethod() {
boolean B<caret>B = false;
}
}

View File

@@ -0,0 +1,21 @@
/*
* Copyright 2000-2011 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
class Test {
void simpleMethod() {
boolean <caret>BB = false;
}
}

View File

@@ -0,0 +1,22 @@
/*
* Copyright 2000-2011 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
class Test {
void simpleMethod() {
System.out.println(<caret>"");
System.out.println("");
}
}

View File

@@ -0,0 +1,30 @@
/*
* Copyright 2000-2011 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
class Test {
private static final Object LOG = null;
private final Set<Map> myMethods = new HashSet<Map>();
private final Set<Map> myMethods1 = new HashSet<Map>();
public void method(Map<Object, Object> args) {
final Object toThrow = args.get("throws");
if (toThrow instanceof List) {
final ArrayList<String> list = new ArrayList<String>();
args.put("thr<caret>ows", list);
} else if (toThrow != null) {
args.put("throws", Collections.singleton(toThrow));
}
myMethods.add(args);
}
}

View File

@@ -0,0 +1,31 @@
/*
* Copyright 2000-2011 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
class Test {
private static final Object LOG = null;
public static final String THROWS = "throws";
private final Set<Map> myMethods = new HashSet<Map>();
private final Set<Map> myMethods1 = new HashSet<Map>();
public void method(Map<Object, Object> args) {
final Object toThrow = args.get(THROWS);
if (toThrow instanceof List) {
final ArrayList<String> list = new ArrayList<String>();
args.put(THROWS, list);
} else if (toThrow != null) {
args.put(THROWS, Collections.singleton(toThrow));
}
myMethods.add(args);
}
}