Fixed bug 457547: extract number with quick fix doesn't replace all the
occurrences
Change-Id: I0239a279fa1cf8cde65480216ef95a597d2a630d
diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/AssistQuickFixTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/AssistQuickFixTest.java
index deddb90..42aaf2b 100644
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/AssistQuickFixTest.java
+++ b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/AssistQuickFixTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2014 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -1701,6 +1701,64 @@
assertExpectedExistInProposals(proposals, new String[] { ex1, ex2, ex3 });
}
+ public void testExtractToLocalVariable4() throws Exception {
+ //bug 457547
+ IPackageFragment pack1= fSourceFolder.createPackageFragment("test", false, null);
+ StringBuffer buf= new StringBuffer();
+ buf.append("package test;\n");
+ buf.append("public class E {\n");
+ buf.append(" public E() {\n");
+ buf.append(" int a = 1;\n");
+ buf.append(" int b = 1;\n");
+ buf.append(" }\n");
+ buf.append("}\n");
+ ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
+
+ String selection= "1";
+ int offset= buf.toString().indexOf(selection);
+ AssistContext context= getCorrectionContext(cu, offset, selection.length());
+ List proposals= collectAssists(context, false);
+
+ assertNumberOfProposals(proposals, 4);
+ assertCorrectLabels(proposals);
+
+ buf= new StringBuffer();
+ buf.append("package test;\n");
+ buf.append("public class E {\n");
+ buf.append(" public E() {\n");
+ buf.append(" int i = 1;\n");
+ buf.append(" int a = i;\n");
+ buf.append(" int b = i;\n");
+ buf.append(" }\n");
+ buf.append("}\n");
+ String ex1= buf.toString();
+
+ buf= new StringBuffer();
+ buf.append("package test;\n");
+ buf.append("public class E {\n");
+ buf.append(" public E() {\n");
+ buf.append(" int i = 1;\n");
+ buf.append(" int a = i;\n");
+ buf.append(" int b = 1;\n");
+ buf.append(" }\n");
+ buf.append("}\n");
+ String ex2= buf.toString();
+
+ buf= new StringBuffer();
+ buf.append("package test;\n");
+ buf.append("public class E {\n");
+ buf.append(" private static final int _1 = 1;\n");
+ buf.append("\n");
+ buf.append(" public E() {\n");
+ buf.append(" int a = _1;\n");
+ buf.append(" int b = 1;\n");
+ buf.append(" }\n");
+ buf.append("}\n");
+ String ex3= buf.toString();
+
+ assertExpectedExistInProposals(proposals, new String[] { ex1, ex2, ex3 });
+ }
+
public void testExtractToMethod1() throws Exception {
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=41302
IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/QuickAssistProcessor.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/QuickAssistProcessor.java
index 114808c..cbf5bed 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/QuickAssistProcessor.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/QuickAssistProcessor.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2014 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -404,6 +404,7 @@
final ICompilationUnit cu= context.getCompilationUnit();
ExtractTempRefactoring extractTempRefactoring= new ExtractTempRefactoring(context.getASTRoot(), context.getSelectionOffset(), context.getSelectionLength());
if (extractTempRefactoring.checkInitialConditions(new NullProgressMonitor()).isOK()) {
+ extractTempRefactoring.setReplaceAllOccurrences(true);
LinkedProposalModel linkedProposalModel= new LinkedProposalModel();
extractTempRefactoring.setLinkedProposalModel(linkedProposalModel);
extractTempRefactoring.setCheckResultForCompileProblems(false);
