Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Corbat2016-06-09 11:50:46 -0400
committerThomas Corbat2016-06-09 11:50:46 -0400
commitc3af58b543f01981a62cda88116a853d6d3b76e4 (patch)
tree9464a6d8ed44b89039986c0c95c0bf160b048083
parent3868ed045e093ad4a5222a588ab5e91605efc0c3 (diff)
downloadorg.eclipse.cdt-c3af58b543f01981a62cda88116a853d6d3b76e4.tar.gz
org.eclipse.cdt-c3af58b543f01981a62cda88116a853d6d3b76e4.tar.xz
org.eclipse.cdt-c3af58b543f01981a62cda88116a853d6d3b76e4.zip
Revert "Bug 488109 Refactoring of Extract Constant Implementation"
-rw-r--r--core/org.eclipse.cdt.ui.tests/.classpath2
-rw-r--r--core/org.eclipse.cdt.ui.tests/.settings/org.eclipse.jdt.core.prefs8
-rw-r--r--core/org.eclipse.cdt.ui.tests/META-INF/MANIFEST.MF2
-rw-r--r--core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/extractconstant/ExtractConstantRefactoringTest.java227
-rw-r--r--core/org.eclipse.cdt.ui/.classpath2
-rw-r--r--core/org.eclipse.cdt.ui/.settings/org.eclipse.jdt.core.prefs6
-rw-r--r--core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractconstant/ExtractConstantInfo.java23
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractconstant/ExtractConstantRefactoring.java485
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractconstant/Messages.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractconstant/Messages.properties3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/IdentifierHelper.java4
-rwxr-xr-xcore/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/NodeHelper.java4
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/SelectionHelper.java11
14 files changed, 262 insertions, 520 deletions
diff --git a/core/org.eclipse.cdt.ui.tests/.classpath b/core/org.eclipse.cdt.ui.tests/.classpath
index b4784f4c94..918a14ebbc 100644
--- a/core/org.eclipse.cdt.ui.tests/.classpath
+++ b/core/org.eclipse.cdt.ui.tests/.classpath
@@ -2,7 +2,7 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="ui"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/core/org.eclipse.cdt.ui.tests/.settings/org.eclipse.jdt.core.prefs b/core/org.eclipse.cdt.ui.tests/.settings/org.eclipse.jdt.core.prefs
index e5c000a63d..4af03ef8a8 100644
--- a/core/org.eclipse.cdt.ui.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/core/org.eclipse.cdt.ui.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -78,7 +78,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=ignore
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
diff --git a/core/org.eclipse.cdt.ui.tests/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.ui.tests/META-INF/MANIFEST.MF
index 934830e40d..894da93baf 100644
--- a/core/org.eclipse.cdt.ui.tests/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.ui.tests/META-INF/MANIFEST.MF
@@ -37,4 +37,4 @@ Require-Bundle: org.eclipse.jface.text,
org.eclipse.core.filesystem;bundle-version="1.2.0"
Bundle-ActivationPolicy: lazy
Bundle-Vendor: Eclipse CDT
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/extractconstant/ExtractConstantRefactoringTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/extractconstant/ExtractConstantRefactoringTest.java
index bf9a0ccc49..3606b7524b 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/extractconstant/ExtractConstantRefactoringTest.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/extractconstant/ExtractConstantRefactoringTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2016 Institute for Software, HSR Hochschule fuer Technik
+ * Copyright (c) 2008, 2012 Institute for Software, HSR Hochschule fuer Technik
* Rapperswil, University of applied sciences and others
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -9,21 +9,14 @@
* Contributors:
* Institute for Software - initial API and implementation
* Sergey Prigogin (Google)
- * Thomas Corbat (IFS)
*******************************************************************************/
package org.eclipse.cdt.ui.tests.refactoring.extractconstant;
import junit.framework.Test;
-import java.util.Arrays;
-import java.util.function.Predicate;
-import org.eclipse.core.runtime.CoreException;
-import org.junit.Before;
-
import org.eclipse.cdt.ui.tests.refactoring.RefactoringTestBase;
import org.eclipse.cdt.internal.ui.refactoring.CRefactoring;
-import org.eclipse.cdt.internal.ui.refactoring.CRefactoringContext;
import org.eclipse.cdt.internal.ui.refactoring.extractconstant.ExtractConstantInfo;
import org.eclipse.cdt.internal.ui.refactoring.extractconstant.ExtractConstantRefactoring;
import org.eclipse.cdt.internal.ui.refactoring.utils.VisibilityEnum;
@@ -32,8 +25,8 @@ import org.eclipse.cdt.internal.ui.refactoring.utils.VisibilityEnum;
* Tests for Extract Constant refactoring.
*/
public class ExtractConstantRefactoringTest extends RefactoringTestBase {
- private String extractedConstantName;
- private VisibilityEnum visibility;
+ private String extractedConstantName = "EXTRACTED";
+ private VisibilityEnum visibility = VisibilityEnum.v_private;
private ExtractConstantRefactoring refactoring;
public ExtractConstantRefactoringTest() {
@@ -48,13 +41,6 @@ public class ExtractConstantRefactoringTest extends RefactoringTestBase {
return suite(ExtractConstantRefactoringTest.class);
}
- @Before
- public void setUp() throws Exception {
- extractedConstantName = "EXTRACTED";
- visibility = VisibilityEnum.v_private;
- super.setUp();
- }
-
@Override
protected CRefactoring createRefactoring() {
refactoring = new ExtractConstantRefactoring(getSelectedTranslationUnit(), getSelection(),
@@ -806,211 +792,4 @@ public class ExtractConstantRefactoringTest extends RefactoringTestBase {
public void testHistoryReplaceNumberPrivate() throws Exception {
assertRefactoringSuccess();
}
-
- //A.cpp
- //void foo() {
- // int a = -(/*$*/+(~(10))/*$$*/);
- // int b = -(+(~(10)));
- // int c = -(+(~(11)));
- // int d = +(~(10));
- // int e = (~10);
- // int f = -(+(-(10)));
- //}
- //=
- //A.cpp
- //namespace {
- //
- //const int EXTRACTED = +(~(10));
- //
- //}
- //
- //void foo() {
- // int a = -(EXTRACTED);
- // int b = -(EXTRACTED);
- // int c = -(+(~(11)));
- // int d = EXTRACTED;
- // int e = (~10);
- // int f = -(+(-(10)));
- //}
- public void testExtractionOfUnaryExpressions() throws Exception {
- assertRefactoringSuccess();
- }
-
- //A.cpp
- //void foo() {
- // int i = /*$*/2 * 21/*$$*/;
- //}
- //=
- //namespace {
- //
- //const int EXTRACTED = 2 * 21;
- //
- //}
- //
- //void foo() {
- // int i = EXTRACTED;
- //}
- public void testSingleBinaryExpression() throws Exception {
- assertRefactoringSuccess();
- }
-
- //A.cpp
- //void foo(int) {
- // foo(/*$*/2 * 21/*$$*/);
- //}
- //=
- //namespace {
- //
- //const int EXTRACTED = 2 * 21;
- //
- //}
- //
- //void foo(int) {
- // foo(EXTRACTED);
- //}
- public void testBinaryExpressionInFunctionCall() throws Exception {
- assertRefactoringSuccess();
- }
-
- //A.cpp
- //void foo(int, int) {
- // foo(/*$*/2, 21/*$$*/);
- //}
- public void testExtractTwoIndependentLiterals() throws Exception {
- assertRefactoringFailure();
- }
-
- //A.cpp
- //void foo(int, int) {
- // /*$*/foo(2, 21)/*$$*/;
- //}
- public void testExtractFunctionCall() throws Exception {
- assertRefactoringFailure();
- }
-
- //A.cpp
- //void foo() {
- // int i = 42;
- //}
- public void testNoSelection() throws Exception {
- assertRefactoringFailure();
- }
-
- //A.cpp
- //void foo() {
- // int i = 15;
- // int j = /*$*/i/*$$*/;
- //}
- public void testExtractIdentifier() throws Exception {
- assertRefactoringFailure();
- }
-
- //A.cpp
- //void foo() {
- // int i = 4/*$*//*$$*/2;
- //}
- //=
- //namespace {
- //
- //const int EXTRACTED = 42;
- //
- //}
- //
- //void foo() {
- // int i = EXTRACTED;
- //}
- public void testCarretInLiteral() throws Exception {
- assertRefactoringSuccess();
- }
-
- //A.cpp
- //void foo() {
- // int i = 42/*$*//*$$*/;
- //}
- //=
- //namespace {
- //
- //const int EXTRACTED = 42;
- //
- //}
- //
- //void foo() {
- // int i = EXTRACTED;
- //}
- public void testCarretAtLiteral() throws Exception {
- assertRefactoringSuccess();
- }
-
-
- //A.cpp
- //int i = /*$*/42/*$$*/;
- public void testDefaultNameForIntegerLiteral() throws Exception {
- runUpToInitialConditions();
- ExtractConstantInfo refactoringInfo = refactoring.getRefactoringInfo();
- assertEquals("_42", refactoringInfo.getName());
- }
-
- // A.cpp
- // namespace NS_1 {
- // int i_in_NS1, j_in_NS1;
- // struct S_in_NS1;
- // }
- // namespace NS_2 {
- // int i_in_NS2;
- // struct S_in_NS2;
- // }
- // using NS_1::j_in_NS1;
- // using namespace NS_2;
- // int global_variable;
- // void free_function();
- // struct S {
- // void function(int parameter) {
- // int local_before;
- // int local_at = /*$*/42/*$$*/;
- // {
- // int nested;
- // }
- // int local_after;
- // }
- // int member_variable;
- // void member_function();
- // };
- public void testOccupiedAndFreeNamesInContext() throws Exception {
- runUpToInitialConditions();
- ExtractConstantInfo refactoringInfo = refactoring.getRefactoringInfo();
-
- String[] expectedOccupiedNames = { "free_function", "function",
- "global_variable", "i_in_NS2", "j_in_NS1", "local_after",
- "local_at", "local_before", "member_function",
- "member_variable", "parameter", "NS_1", "NS_2", "S",
- "S_in_NS2" };
- String[] expectedFreeNames = { "_42", "i_in_NS1", "nested", "S_in_NS1" };
- String[] allNames = combine(expectedOccupiedNames, expectedFreeNames);
- String[] usedNames = Arrays.stream(allNames)
- .filter(refactoringInfo::isNameUsed)
- .toArray(String[]::new);
- String[] freeNames = Arrays.stream(allNames)
- .filter(not(refactoringInfo::isNameUsed))
- .toArray(String[]::new);
-
- assertEquals(Arrays.toString(expectedOccupiedNames), Arrays.toString(usedNames));
- assertEquals(Arrays.toString(expectedFreeNames), Arrays.toString(freeNames));
- }
-
- private <T> Predicate<? super T> not(Predicate<? super T> predicate) {
- return predicate.negate()::test;
- }
-
- private String[] combine(String[] array1, String[] array2) {
- String[] result = new String[array1.length + array2.length];
- System.arraycopy(array1, 0, result, 0, array1.length);
- System.arraycopy(array2, 0, result, array1.length, array2.length);
- return result;
- }
-
- private void runUpToInitialConditions() throws CoreException {
- createRefactoring();
- refactoring.setContext(new CRefactoringContext(refactoring));
- refactoring.checkInitialConditions(npm());
- }
}
diff --git a/core/org.eclipse.cdt.ui/.classpath b/core/org.eclipse.cdt.ui/.classpath
index 9500e6b71b..9c85daf9f2 100644
--- a/core/org.eclipse.cdt.ui/.classpath
+++ b/core/org.eclipse.cdt.ui/.classpath
@@ -4,7 +4,7 @@
<classpathentry kind="src" path="utils.ui"/>
<classpathentry kind="src" path="browser"/>
<classpathentry kind="src" path="templateengine"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/core/org.eclipse.cdt.ui/.settings/org.eclipse.jdt.core.prefs b/core/org.eclipse.cdt.ui/.settings/org.eclipse.jdt.core.prefs
index ca337be63c..3933fad141 100644
--- a/core/org.eclipse.cdt.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/core/org.eclipse.cdt.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -78,7 +78,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff --git a/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF
index 9e6eb75818..bc93949aad 100644
--- a/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF
@@ -124,4 +124,4 @@ Require-Bundle: org.eclipse.cdt.core;bundle-version="[5.2.0,7.0.0)",
com.ibm.icu;bundle-version="4.4.2",
org.eclipse.e4.ui.css.swt.theme
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractconstant/ExtractConstantInfo.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractconstant/ExtractConstantInfo.java
index dcc0a16a0d..256328d053 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractconstant/ExtractConstantInfo.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractconstant/ExtractConstantInfo.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2016 Institute for Software, HSR Hochschule fuer Technik
+ * Copyright (c) 2008, 2012 Institute for Software, HSR Hochschule fuer Technik
* Rapperswil, University of applied sciences and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -9,12 +9,9 @@
* Contributors:
* Institute for Software (IFS) - initial API and implementation
* Sergey Prigogin (Google)
- * Thomas Corbat (IFS)
******************************************************************************/
package org.eclipse.cdt.internal.ui.refactoring.extractconstant;
-import java.util.function.Predicate;
-
import org.eclipse.cdt.internal.ui.refactoring.MethodContext;
import org.eclipse.cdt.internal.ui.refactoring.VariableNameInformation;
import org.eclipse.cdt.internal.ui.refactoring.utils.VisibilityEnum;
@@ -25,16 +22,6 @@ import org.eclipse.cdt.internal.ui.refactoring.utils.VisibilityEnum;
public class ExtractConstantInfo extends VariableNameInformation {
private VisibilityEnum visibility = VisibilityEnum.v_private;
private MethodContext methodContext;
- private Predicate<String> nameUsedChecker = (String) -> false;
- private boolean replaceAllLiterals = true;
-
- public boolean isReplaceAllOccurences() {
- return replaceAllLiterals;
- }
-
- public void setReplaceAllLiterals(boolean replaceAllLiterals) {
- this.replaceAllLiterals = replaceAllLiterals;
- }
public VisibilityEnum getVisibility() {
return visibility;
@@ -50,12 +37,4 @@ public class ExtractConstantInfo extends VariableNameInformation {
public void setMethodContext(MethodContext context) {
methodContext = context;
}
-
- public void setNameUsedChecker(Predicate<String> nameOccupiedChecker) {
- this.nameUsedChecker = nameOccupiedChecker;
- }
-
- public boolean isNameUsed(String name) {
- return nameUsedChecker.test(name);
- }
}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractconstant/ExtractConstantRefactoring.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractconstant/ExtractConstantRefactoring.java
index 66ec9f6d54..fadf1de069 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractconstant/ExtractConstantRefactoring.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractconstant/ExtractConstantRefactoring.java
@@ -9,7 +9,6 @@
* Contributors:
* Institute for Software - initial API and implementation
* Sergey Prigogin (Google)
- * Thomas Corbat (IFS)
*******************************************************************************/
package org.eclipse.cdt.internal.ui.refactoring.extractconstant;
@@ -17,7 +16,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
-import java.util.stream.Collectors;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -25,6 +23,7 @@ import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.SubMonitor;
import org.eclipse.core.runtime.preferences.IPreferencesService;
+import org.eclipse.jface.text.Region;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.ltk.core.refactoring.RefactoringDescriptor;
import org.eclipse.ltk.core.refactoring.RefactoringStatus;
@@ -32,13 +31,13 @@ import org.eclipse.text.edits.TextEditGroup;
import org.eclipse.cdt.core.dom.ast.ASTNodeFactoryFactory;
import org.eclipse.cdt.core.dom.ast.ASTVisitor;
-import org.eclipse.cdt.core.dom.ast.IASTBinaryExpression;
import org.eclipse.cdt.core.dom.ast.IASTDeclSpecifier;
import org.eclipse.cdt.core.dom.ast.IASTDeclaration;
import org.eclipse.cdt.core.dom.ast.IASTDeclarator;
import org.eclipse.cdt.core.dom.ast.IASTEqualsInitializer;
import org.eclipse.cdt.core.dom.ast.IASTExpression;
-import org.eclipse.cdt.core.dom.ast.IASTIdExpression;
+import org.eclipse.cdt.core.dom.ast.IASTFileLocation;
+import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition;
import org.eclipse.cdt.core.dom.ast.IASTLiteralExpression;
import org.eclipse.cdt.core.dom.ast.IASTMacroExpansionLocation;
import org.eclipse.cdt.core.dom.ast.IASTNode;
@@ -47,7 +46,6 @@ import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression;
import org.eclipse.cdt.core.dom.ast.IBinding;
import org.eclipse.cdt.core.dom.ast.INodeFactory;
-import org.eclipse.cdt.core.dom.ast.IScope;
import org.eclipse.cdt.core.dom.ast.IType;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCompositeTypeSpecifier;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTNamespaceDefinition;
@@ -56,19 +54,24 @@ import org.eclipse.cdt.core.dom.rewrite.ASTRewrite;
import org.eclipse.cdt.core.dom.rewrite.DeclarationGenerator;
import org.eclipse.cdt.core.model.ICElement;
import org.eclipse.cdt.core.model.ICProject;
+import org.eclipse.cdt.core.model.ITranslationUnit;
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.cdt.ui.PreferenceConstants;
-import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPVisitor;
+import org.eclipse.cdt.internal.core.dom.parser.ASTQueries;
+import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTEqualsInitializer;
+import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTIdExpression;
+import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTLiteralExpression;
+import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTName;
+import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTSimpleDeclaration;
+import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPMethod;
import org.eclipse.cdt.internal.ui.refactoring.CRefactoring;
import org.eclipse.cdt.internal.ui.refactoring.CRefactoringDescriptor;
import org.eclipse.cdt.internal.ui.refactoring.ClassMemberInserter;
import org.eclipse.cdt.internal.ui.refactoring.MethodContext;
import org.eclipse.cdt.internal.ui.refactoring.ModificationCollector;
-import org.eclipse.cdt.internal.ui.refactoring.utils.IdentifierHelper;
import org.eclipse.cdt.internal.ui.refactoring.utils.NodeHelper;
-import org.eclipse.cdt.internal.ui.refactoring.utils.SelectionHelper;
import org.eclipse.cdt.internal.ui.util.NameComposer;
/**
@@ -77,268 +80,201 @@ import org.eclipse.cdt.internal.ui.util.NameComposer;
* @author Mirko Stocker
*/
public class ExtractConstantRefactoring extends CRefactoring {
- private final class SelectedExpressionFinderVisitor extends ASTVisitor {
- {
- shouldVisitExpressions = true;
- }
-
- private IASTExpression selectedExpression;
-
- @Override
- public int visit(IASTExpression expression) {
- if (SelectionHelper.nodeMatchesSelection(expression, selectedRegion)) {
- selectedExpression = expression;
- return PROCESS_ABORT;
- } else if (expression instanceof IASTLiteralExpression && SelectionHelper.isSelectionInsideNode(expression, selectedRegion)) {
- selectedExpression = expression;
- return PROCESS_ABORT;
- }
- return super.visit(expression);
- }
- }
-
- private static final String PREFIX_FOR_NAME_WITH_LEADING_DIGIT = "_"; //$NON-NLS-1$
-
public static final String ID =
"org.eclipse.cdt.ui.refactoring.extractconstant.ExtractConstantRefactoring"; //$NON-NLS-1$
- private IASTExpression target;
+ private IASTLiteralExpression target;
private final ExtractConstantInfo info;
+ private final ArrayList<IASTExpression> literalsToReplace = new ArrayList<IASTExpression>();
public ExtractConstantRefactoring(ICElement element, ISelection selection, ICProject project) {
super(element, selection, project);
this.info = new ExtractConstantInfo();
- name = Messages.ExtractConstantRefactoring_ExtractConst;
+ name = Messages.ExtractConstantRefactoring_ExtractConst;
}
@Override
public RefactoringStatus checkInitialConditions(IProgressMonitor pm) throws CoreException, OperationCanceledException {
- SubMonitor sm = SubMonitor.convert(pm, 12);
+ SubMonitor sm = SubMonitor.convert(pm, 10);
try {
RefactoringStatus status = super.checkInitialConditions(sm.newChild(8));
if (status.hasError()) {
return status;
}
-
- if (selectedRegion == null) {
- status.addFatalError(Messages.ExtractConstantRefactoring_LiteralMustBeSelected);
- return status;
- }
-
- IASTExpression selectedExpression = findSelectedExpression(sm.newChild(1));
- if (selectedExpression == null) {
- status.addFatalError(Messages.ExtractConstantRefactoring_LiteralMustBeSelected);
- return status;
- }
-
- if (!isExtractableExpression(selectedExpression)) {
- status.addFatalError(Messages.ExtractConstantRefactoring_LiteralMustBeSelected);
- }
-
+
Collection<IASTLiteralExpression> literalExpressionCollection = findAllLiterals(sm.newChild(1));
if (literalExpressionCollection.isEmpty()) {
- status.addFatalError(Messages.ExtractConstantRefactoring_LiteralMustBeSelected);
- return status;
+ initStatus.addFatalError(Messages.ExtractConstantRefactoring_LiteralMustBeSelected);
+ return initStatus;
}
-
- target = selectedExpression;
-
+
+ boolean oneMarked =
+ selectedRegion != null && isOneMarked(literalExpressionCollection, selectedRegion);
+ if (!oneMarked) {
+ // None or more than one literal selected
+ if (target == null) {
+ // No l found;
+ initStatus.addFatalError(Messages.ExtractConstantRefactoring_NoLiteralSelected);
+ } else {
+ // To many selection found
+ initStatus.addFatalError(Messages.ExtractConstantRefactoring_TooManyLiteralSelected);
+ }
+ return initStatus;
+ }
+
+ findAllNodesForReplacement(literalExpressionCollection);
+
+ info.addNamesToUsedNames(findAllDeclaredNames());
if (info.getName().isEmpty()) {
info.setName(getDefaultName(target));
}
info.setMethodContext(NodeHelper.findMethodContext(target, refactoringContext, sm.newChild(1)));
- IScope containingScope = CPPVisitor.getContainingScope(target);
- IASTTranslationUnit ast = target.getTranslationUnit();
- info.setNameUsedChecker((String name) -> {
- IBinding[] bindingsForName = containingScope.find(name, ast);
- return bindingsForName.length != 0;
- });
- return status;
+ return initStatus;
} finally {
- if (pm != null) {
- pm.done();
- }
+ sm.done();
}
}
- private IASTExpression findSelectedExpression(IProgressMonitor monitor)
- throws OperationCanceledException, CoreException {
- SubMonitor progress = SubMonitor.convert(monitor, 2);
- try {
- IASTTranslationUnit ast = getAST(tu, progress.newChild(1));
- SelectedExpressionFinderVisitor expressionFinder = new SelectedExpressionFinderVisitor();
- ast.accept(expressionFinder);
- return expressionFinder.selectedExpression;
- } finally {
- if (monitor != null) {
- monitor.done();
+ private String getDefaultName(IASTLiteralExpression literal) {
+ String nameString = literal.toString();
+ switch (literal.getKind()) {
+ case IASTLiteralExpression.lk_char_constant:
+ case IASTLiteralExpression.lk_string_literal:
+ int beginIndex = 1;
+ if (nameString.startsWith("L")) { //$NON-NLS-1$
+ beginIndex = 2;
}
- }
- }
-
- private boolean isExtractableExpression(IASTExpression expression) {
- if (expression instanceof IASTLiteralExpression) {
- return true;
- }
- if (expression instanceof IASTUnaryExpression) {
- IASTUnaryExpression unaryExpression = (IASTUnaryExpression) expression;
- return isExtractableExpression(unaryExpression.getOperand());
- }
- if (expression instanceof IASTBinaryExpression) {
- IASTBinaryExpression binaryExpression = (IASTBinaryExpression) expression;
- return isExtractableExpression(binaryExpression.getOperand1()) && isExtractableExpression(binaryExpression.getOperand2());
- }
- return false;
- }
+ final int len= nameString.length();
+ if (beginIndex < len && len > 0) {
+ nameString = nameString.substring(beginIndex, len - 1);
+ }
+ break;
- private String getDefaultName(IASTExpression expression) {
- String nameString = expression.getRawSignature();
- NameComposer composer = createNameComposer();
- String composedName = composer.compose(nameString);
- if (IdentifierHelper.isLeadingADigit(composedName)) {
- composedName = PREFIX_FOR_NAME_WITH_LEADING_DIGIT + composedName;
+ default:
+ break;
}
- return composedName;
- }
- private static NameComposer createNameComposer() {
- IPreferencesService preferences = Platform.getPreferencesService();
- int capitalization = preferences.getInt(CUIPlugin.PLUGIN_ID,
- PreferenceConstants.NAME_STYLE_CONSTANT_CAPITALIZATION,
- PreferenceConstants.NAME_STYLE_CAPITALIZATION_UPPER_CASE, null);
- String wordDelimiter = preferences.getString(CUIPlugin.PLUGIN_ID,
- PreferenceConstants.NAME_STYLE_CONSTANT_WORD_DELIMITER, "_", null); //$NON-NLS-1$
- String prefix = preferences.getString(CUIPlugin.PLUGIN_ID,
+ IPreferencesService preferences = Platform.getPreferencesService();
+ int capitalization = preferences.getInt(CUIPlugin.PLUGIN_ID,
+ PreferenceConstants.NAME_STYLE_CONSTANT_CAPITALIZATION,
+ PreferenceConstants.NAME_STYLE_CAPITALIZATION_UPPER_CASE, null);
+ String wordDelimiter = preferences.getString(CUIPlugin.PLUGIN_ID,
+ PreferenceConstants.NAME_STYLE_CONSTANT_WORD_DELIMITER, "_", null); //$NON-NLS-1$
+ String prefix = preferences.getString(CUIPlugin.PLUGIN_ID,
PreferenceConstants.NAME_STYLE_CONSTANT_PREFIX, "", null); //$NON-NLS-1$
- String suffix = preferences.getString(CUIPlugin.PLUGIN_ID,
- PreferenceConstants.NAME_STYLE_CONSTANT_SUFFIX, "", null); //$NON-NLS-1$
- NameComposer composer = new NameComposer(capitalization, wordDelimiter, prefix, suffix);
- return composer;
+ String suffix = preferences.getString(CUIPlugin.PLUGIN_ID,
+ PreferenceConstants.NAME_STYLE_CONSTANT_SUFFIX, "", null); //$NON-NLS-1$
+ NameComposer composer = new NameComposer(capitalization, wordDelimiter, prefix, suffix);
+ return composer.compose(nameString);
}
- private Collection<IASTLiteralExpression> findAllLiterals(IProgressMonitor monitor)
- throws OperationCanceledException, CoreException {
- SubMonitor progress = SubMonitor.convert(monitor, 2);
- try {
- final Collection<IASTLiteralExpression> result = new ArrayList<IASTLiteralExpression>();
-
- IASTTranslationUnit ast = getAST(tu, progress.newChild(1));
- ast.accept(new ASTVisitor() {
- {
- shouldVisitExpressions = true;
- }
-
- @Override
- public int visit(IASTExpression expression) {
- if (expression instanceof IASTLiteralExpression) {
- if (!(expression.getNodeLocations().length == 1 &&
- expression.getNodeLocations()[0] instanceof IASTMacroExpansionLocation)) {
- IASTLiteralExpression literal = (IASTLiteralExpression) expression;
- result.add(literal);
- }
+ private ArrayList<String> findAllDeclaredNames() {
+ ArrayList<String>names = new ArrayList<String>();
+ IASTFunctionDefinition funcDef = ASTQueries.findAncestorWithType(target, IASTFunctionDefinition.class);
+ ICPPASTCompositeTypeSpecifier comTypeSpec = getCompositeTypeSpecifier(funcDef);
+ if (comTypeSpec != null) {
+ for(IASTDeclaration dec : comTypeSpec.getMembers()) {
+ if (dec instanceof IASTSimpleDeclaration) {
+ IASTSimpleDeclaration simpDec = (IASTSimpleDeclaration) dec;
+ for(IASTDeclarator decor : simpDec.getDeclarators()) {
+ names.add(decor.getName().getRawSignature());
}
- return super.visit(expression);
}
- });
-
- return result;
- } finally {
- if (monitor != null) {
- monitor.done();
}
}
+ return names;
}
- @Override
- protected void collectModifications(IProgressMonitor monitor, ModificationCollector collector)
- throws CoreException, OperationCanceledException{
- SubMonitor progress = SubMonitor.convert(monitor, 100);
- try {
- Collection<IASTExpression> expressionsToReplace = findExpressionsToExtract(progress.newChild(40));
- Collection<IASTExpression> expressionsToReplaceInSameContext = filterLiteralsInSameContext(expressionsToReplace, progress.newChild(30));
- replaceLiteralsWithConstant(expressionsToReplaceInSameContext, collector, progress.newChild(20));
- insertConstantDeclaration(collector, progress.newChild(10));
- } finally {
- if (monitor != null) {
- monitor.done();
+ private ICPPASTCompositeTypeSpecifier getCompositeTypeSpecifier(IASTFunctionDefinition funcDef) {
+ if (funcDef != null) {
+ IBinding binding = funcDef.getDeclarator().getName().resolveBinding();
+ if (binding instanceof CPPMethod) {
+ CPPMethod methode = (CPPMethod) binding;
+ IASTNode[] declarations = methode.getDeclarations();
+
+ IASTNode decl;
+ if (declarations != null) {
+ decl = declarations[0];
+ } else {
+ decl = methode.getDefinition();
+ }
+
+ IASTNode spec = decl.getParent().getParent();
+ if (spec instanceof ICPPASTCompositeTypeSpecifier) {
+ ICPPASTCompositeTypeSpecifier compTypeSpec = (ICPPASTCompositeTypeSpecifier) spec;
+ return compTypeSpec;
+ }
}
}
+ return null;
}
- private void insertConstantDeclaration(ModificationCollector collector, IProgressMonitor monitor) throws CoreException {
- SubMonitor progress = SubMonitor.convert(monitor, 10);
- try {
- MethodContext context = info.getMethodContext();
- IASTTranslationUnit ast = getAST(tu, progress.newChild(9));
- String constName = info.getName();
- if (context.getType() == MethodContext.ContextType.METHOD) {
- ICPPASTCompositeTypeSpecifier classDefinition = (ICPPASTCompositeTypeSpecifier) context.getMethodDeclaration().getParent();
- ClassMemberInserter.createChange(classDefinition, info.getVisibility(), createConstantDeclarationForClass(constName), true, collector);
- } else {
- IASTDeclaration nodes = createGlobalConstantDeclaration(constName, ast.getASTNodeFactory());
- ASTRewrite rewriter = collector.rewriterForTranslationUnit(ast);
- rewriter.insertBefore(ast, getFirstNode(ast), nodes, new TextEditGroup(Messages.ExtractConstantRefactoring_CreateConstant));
+ private void findAllNodesForReplacement(Collection<IASTLiteralExpression> literalExpressionCollection) {
+ if (target.getParent() instanceof IASTUnaryExpression) {
+ IASTUnaryExpression unary = (IASTUnaryExpression) target.getParent();
+ for (IASTLiteralExpression expression : literalExpressionCollection) {
+ if (target.getKind() == expression.getKind()
+ && target.toString().equals(expression.toString())
+ && expression.getParent() instanceof IASTUnaryExpression
+ && unary.getOperator() == ((IASTUnaryExpression)expression.getParent()).getOperator()) {
+ literalsToReplace.add(((IASTUnaryExpression)expression.getParent()));
+ }
}
- } finally {
- if (monitor != null) {
- monitor.done();
+ } else {
+ for (IASTLiteralExpression expression : literalExpressionCollection) {
+ if (target.getKind() == expression.getKind()
+ && target.toString().equals(expression.toString())) {
+ literalsToReplace.add(expression);
+ }
}
}
}
- private void replaceLiteralsWithConstant(Collection<IASTExpression> literals, ModificationCollector collector, IProgressMonitor monitor) {
- SubMonitor progress = SubMonitor.convert(monitor, literals.size());
- String constName = info.getName();
- for (IASTExpression each : literals) {
- IASTTranslationUnit translationUnit = each.getTranslationUnit();
- ASTRewrite rewrite = collector.rewriterForTranslationUnit(translationUnit);
- INodeFactory nodeFactory = translationUnit.getASTNodeFactory();
- IASTIdExpression idExpression = nodeFactory.newIdExpression(nodeFactory.newName(constName.toCharArray()));
- rewrite.replace(each, idExpression, new TextEditGroup(Messages.ExtractConstantRefactoring_ReplaceLiteral));
- progress.worked(1);
- }
- if (monitor != null) {
- monitor.done();
+ private boolean isOneMarked(Collection<IASTLiteralExpression> selectedNodes,
+ Region textSelection) {
+ boolean oneMarked = false;
+ for (IASTLiteralExpression expression : selectedNodes) {
+ if (expression.isPartOfTranslationUnitFile() &&
+ isExpressionInSelection(expression, textSelection)) {
+ if (target == null) {
+ target = expression;
+ oneMarked = true;
+ } else if (!isTargetChild(expression)) {
+ oneMarked = false;
+ }
+ }
}
+ return oneMarked;
}
- private Collection<IASTExpression> filterLiteralsInSameContext(Collection<IASTExpression> literalsToReplace, IProgressMonitor monitor) throws CoreException {
- try{
- SubMonitor progress = SubMonitor.convert(monitor);
- MethodContext context = info.getMethodContext();
- Collection<IASTExpression> locLiteralsToReplace = new ArrayList<IASTExpression>();
- if (context.getType() == MethodContext.ContextType.METHOD) {
- SubMonitor loopProgress = progress.setWorkRemaining(literalsToReplace.size());
- for (IASTExpression expression : literalsToReplace) {
- MethodContext exprContext = NodeHelper.findMethodContext(expression, refactoringContext, loopProgress.newChild(1));
- if (exprContext.getType() == MethodContext.ContextType.METHOD) {
- if (context.getMethodQName() != null) {
- if (MethodContext.isSameClass(exprContext.getMethodQName(), context.getMethodQName())) {
- locLiteralsToReplace.add(expression);
- }
- } else if (MethodContext.isSameClass(exprContext.getMethodDeclarationName(), context.getMethodDeclarationName())) {
- locLiteralsToReplace.add(expression);
- }
- }
- }
- } else {
- literalsToReplace.stream()
- .filter(expr -> expr.getTranslationUnit().getOriginatingTranslationUnit() != null)
- .collect(Collectors.toCollection(() -> locLiteralsToReplace));
- }
- return locLiteralsToReplace;
- } finally {
- if (monitor != null) {
- monitor.done();
- }
+ private static boolean isExpressionInSelection(IASTExpression expression, Region selection) {
+ IASTFileLocation location = expression.getFileLocation();
+ int expressionStart = location.getNodeOffset();
+ int expressionEnd = expressionStart + location.getNodeLength();
+ int selectionStart = selection.getOffset();
+ int selectionEnd = selectionStart + selection.getLength();
+ return expressionStart >= selectionStart && expressionEnd <= selectionEnd;
+ }
+
+ private boolean isTargetChild(IASTExpression child) {
+ if (target == null) {
+ return false;
+ }
+ IASTNode node = child;
+ while (node != null) {
+ if (node.getParent() == target)
+ return true;
+ node = node.getParent();
}
+ return false;
}
- private Collection<IASTExpression> findExpressionsToExtract(IProgressMonitor monitor) throws OperationCanceledException, CoreException {
- SubMonitor progress = SubMonitor.convert(monitor, 10);
- final Collection<IASTExpression> result = new ArrayList<>();
- IASTTranslationUnit ast = getAST(tu, progress.newChild(8));
+ private Collection<IASTLiteralExpression> findAllLiterals(IProgressMonitor pm)
+ throws OperationCanceledException, CoreException {
+ final Collection<IASTLiteralExpression> result = new ArrayList<IASTLiteralExpression>();
+
+ IASTTranslationUnit ast = getAST(tu, pm);
ast.accept(new ASTVisitor() {
{
shouldVisitExpressions = true;
@@ -346,49 +282,86 @@ public class ExtractConstantRefactoring extends CRefactoring {
@Override
public int visit(IASTExpression expression) {
- if (isSameExpressionTree(expression, target)) {
+ if (expression instanceof IASTLiteralExpression) {
if (!(expression.getNodeLocations().length == 1 &&
expression.getNodeLocations()[0] instanceof IASTMacroExpansionLocation)) {
- result.add(expression);
+ IASTLiteralExpression literal = (IASTLiteralExpression) expression;
+ result.add(literal);
}
}
return super.visit(expression);
}
});
- progress.worked(3);
+
return result;
}
- private static boolean isSameExpressionTree(IASTExpression expression1, IASTExpression expression2) {
- if (expression1 instanceof IASTLiteralExpression && expression2 instanceof IASTLiteralExpression) {
- IASTLiteralExpression literalExpression1 = (IASTLiteralExpression) expression1;
- IASTLiteralExpression literalExpression2 = (IASTLiteralExpression) expression2;
- return literalExpression1.getKind() == literalExpression2.getKind() && String.valueOf(expression1).equals(String.valueOf(expression2));
- }
- if (expression1 instanceof IASTUnaryExpression && expression2 instanceof IASTUnaryExpression) {
- IASTUnaryExpression unaryExpression1 = (IASTUnaryExpression) expression1;
- IASTUnaryExpression unaryExpression2 = (IASTUnaryExpression) expression2;
- if (unaryExpression1.getOperator() == unaryExpression2.getOperator()) {
- return isSameExpressionTree(unaryExpression1.getOperand(), unaryExpression2.getOperand());
+ @Override
+ protected void collectModifications(IProgressMonitor pm, ModificationCollector collector)
+ throws CoreException, OperationCanceledException{
+ SubMonitor progress = SubMonitor.convert(pm, 10);
+ MethodContext context = info.getMethodContext();
+ Collection<IASTExpression> locLiteralsToReplace = new ArrayList<IASTExpression>();
+
+ IASTTranslationUnit ast = getAST(tu, progress.newChild(9));
+ if (context.getType() == MethodContext.ContextType.METHOD) {
+ SubMonitor loopProgress = progress.newChild(1).setWorkRemaining(literalsToReplace.size());
+ for (IASTExpression expression : literalsToReplace) {
+ MethodContext exprContext =
+ NodeHelper.findMethodContext(expression, refactoringContext, loopProgress.newChild(1));
+ if (exprContext.getType() == MethodContext.ContextType.METHOD) {
+ if (context.getMethodQName() != null) {
+ if (MethodContext.isSameClass(exprContext.getMethodQName(), context.getMethodQName())) {
+ locLiteralsToReplace.add(expression);
+ }
+ } else {
+ if (MethodContext.isSameClass(exprContext.getMethodDeclarationName(),
+ context.getMethodDeclarationName())) {
+ locLiteralsToReplace.add(expression);
+ }
+ }
+ }
}
- }
- if (expression1 instanceof IASTBinaryExpression && expression2 instanceof IASTBinaryExpression) {
- IASTBinaryExpression binaryExpression1 = (IASTBinaryExpression) expression1;
- IASTBinaryExpression binaryExpression2 = (IASTBinaryExpression) expression2;
- if (binaryExpression1.getOperator() == binaryExpression2.getOperator()) {
- return isSameExpressionTree(binaryExpression1.getOperand1(), binaryExpression2.getOperand1())
- && isSameExpressionTree(binaryExpression1.getOperand2(), binaryExpression2.getOperand2());
+ } else {
+ for (IASTExpression expression : literalsToReplace) {
+ ITranslationUnit expressionTu = expression.getTranslationUnit().getOriginatingTranslationUnit();
+ if (expressionTu.getResource() != null) {
+ locLiteralsToReplace.add(expression);
+ }
}
}
- return false;
+
+ // Create all changes for literals
+ String constName = info.getName();
+ createLiteralToConstantChanges(constName, locLiteralsToReplace, collector);
+
+ if (context.getType() == MethodContext.ContextType.METHOD) {
+ ICPPASTCompositeTypeSpecifier classDefinition =
+ (ICPPASTCompositeTypeSpecifier) context.getMethodDeclaration().getParent();
+ ClassMemberInserter.createChange(classDefinition, info.getVisibility(),
+ getConstNodesClass(constName), true, collector);
+ } else {
+ IASTDeclaration nodes = getConstNodesGlobal(constName, ast.getASTNodeFactory());
+ ASTRewrite rewriter = collector.rewriterForTranslationUnit(ast);
+ rewriter.insertBefore(ast, getFirstNode(ast), nodes,
+ new TextEditGroup(Messages.ExtractConstantRefactoring_CreateConstant));
+ }
}
/**
* @return the first node in the translation unit or null
*/
private static IASTNode getFirstNode(IASTTranslationUnit ast) {
- IASTDeclaration[] declarations = ast.getDeclarations();
- return (declarations.length > 0) ? declarations[0] : null;
+ IASTDeclaration firstNode = null;
+ for (IASTDeclaration each : ast.getDeclarations()) {
+ if (firstNode == null) {
+ firstNode = each;
+ } else if (each.getNodeLocations() != null &&
+ each.getNodeLocations()[0].getNodeOffset() < firstNode.getNodeLocations()[0].getNodeOffset()) {
+ firstNode = each;
+ }
+ }
+ return firstNode;
}
@Override
@@ -409,7 +382,18 @@ public class ExtractConstantRefactoring extends CRefactoring {
return arguments;
}
- private IASTSimpleDeclaration createConstantDeclaration(String newName) {
+ private void createLiteralToConstantChanges(String constName,
+ Iterable<? extends IASTExpression> literals, ModificationCollector collector) {
+ for (IASTExpression each : literals) {
+ ASTRewrite rewrite = collector.rewriterForTranslationUnit(each.getTranslationUnit());
+ CPPASTIdExpression idExpression =
+ new CPPASTIdExpression(new CPPASTName(constName.toCharArray()));
+ rewrite.replace(each, idExpression,
+ new TextEditGroup(Messages.ExtractConstantRefactoring_ReplaceLiteral));
+ }
+ }
+
+ private IASTSimpleDeclaration getConstNodes(String newName) {
ICPPNodeFactory factory = ASTNodeFactoryFactory.getDefaultCPPNodeFactory();
DeclarationGenerator generator = DeclarationGenerator.create(factory);
@@ -420,21 +404,30 @@ public class ExtractConstantRefactoring extends CRefactoring {
IASTDeclarator declarator = generator.createDeclaratorFromType(type, newName.toCharArray());
- IASTSimpleDeclaration simple = factory.newSimpleDeclaration(declSpec);
-
- IASTEqualsInitializer init = factory.newEqualsInitializer(target.copy());
+ IASTSimpleDeclaration simple = new CPPASTSimpleDeclaration();
+ simple.setDeclSpecifier(declSpec);
+
+ IASTEqualsInitializer init = new CPPASTEqualsInitializer();
+ if (target.getParent() instanceof IASTUnaryExpression) {
+ IASTUnaryExpression unary = (IASTUnaryExpression) target.getParent();
+ init.setInitializerClause(unary);
+ } else {
+ CPPASTLiteralExpression expression =
+ new CPPASTLiteralExpression(target.getKind(), target.getValue());
+ init.setInitializerClause(expression);
+ }
declarator.setInitializer(init);
simple.addDeclarator(declarator);
return simple;
}
- private IASTDeclaration createGlobalConstantDeclaration(String newName, INodeFactory nodeFactory) {
- IASTSimpleDeclaration simple = createConstantDeclaration(newName);
+ private IASTDeclaration getConstNodesGlobal(String newName, INodeFactory nodeFactory) {
+ IASTSimpleDeclaration simple = getConstNodes(newName);
if (nodeFactory instanceof ICPPNodeFactory) {
ICPPASTNamespaceDefinition namespace =
- ((ICPPNodeFactory) nodeFactory).newNamespaceDefinition(nodeFactory.newName());
+ ((ICPPNodeFactory) nodeFactory).newNamespaceDefinition(new CPPASTName());
namespace.addDeclaration(simple);
return namespace;
}
@@ -443,8 +436,8 @@ public class ExtractConstantRefactoring extends CRefactoring {
return simple;
}
- private IASTDeclaration createConstantDeclarationForClass(String newName) {
- IASTSimpleDeclaration simple = createConstantDeclaration(newName);
+ private IASTDeclaration getConstNodesClass(String newName) {
+ IASTSimpleDeclaration simple = getConstNodes(newName);
simple.getDeclSpecifier().setStorageClass(IASTDeclSpecifier.sc_static);
return simple;
}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractconstant/Messages.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractconstant/Messages.java
index e16241c69f..fcfbb94c3c 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractconstant/Messages.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractconstant/Messages.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2016 Institute for Software, HSR Hochschule fuer Technik
+ * Copyright (c) 2008, 2012 Institute for Software, HSR Hochschule fuer Technik
* Rapperswil, University of applied sciences and others
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -20,6 +20,7 @@ final class Messages extends NLS {
public static String ExtractConstantRefactoring_ExtractConst;
public static String ExtractConstantRefactoring_LiteralMustBeSelected;
public static String ExtractConstantRefactoring_NoLiteralSelected;
+ public static String ExtractConstantRefactoring_TooManyLiteralSelected;
public static String ExtractConstantRefactoring_CreateConstant;
public static String ExtractConstantRefactoring_ReplaceLiteral;
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractconstant/Messages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractconstant/Messages.properties
index 33b6323c96..c1c67fa6b0 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractconstant/Messages.properties
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractconstant/Messages.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2008, 2016 Institute for Software, HSR Hochschule fuer Technik
+# Copyright (c) 2008, 2012 Institute for Software, HSR Hochschule fuer Technik
# Rapperswil, University of applied sciences and others
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
@@ -16,6 +16,7 @@ InputPage_NameAlreadyDefined=An element named ''{0}'' is already defined in this
ExtractConstantRefactoring_ExtractConst=Extract Constant
ExtractConstantRefactoring_LiteralMustBeSelected=An literal expression must be selected to activate this refactoring.
ExtractConstantRefactoring_NoLiteralSelected=No selected literal.
+ExtractConstantRefactoring_TooManyLiteralSelected=Too many literals selected.
ExtractConstantRefactoring_CreateConstant=Create constant
ExtractConstantRefactoring_ReplaceLiteral=Replace a literal
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/IdentifierHelper.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/IdentifierHelper.java
index dc615dc225..908a81c4f8 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/IdentifierHelper.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/IdentifierHelper.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2016 Institute for Software, HSR Hochschule fuer Technik
+ * Copyright (c) 2008, 2012 Institute for Software, HSR Hochschule fuer Technik
* Rapperswil, University of applied sciences and others
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -68,7 +68,7 @@ public class IdentifierHelper {
return m.find();
}
- public static boolean isLeadingADigit(String identifier) {
+ private static boolean isLeadingADigit(String identifier) {
Pattern p = Pattern.compile("\\d.*"); //$NON-NLS-1$
Matcher m = p.matcher(identifier);
return m.matches();
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/NodeHelper.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/NodeHelper.java
index 60eae1625b..a76eaadc3b 100755
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/NodeHelper.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/NodeHelper.java
@@ -109,9 +109,7 @@ public class NodeHelper {
context.setType(MethodContext.ContextType.FUNCTION);
}
}
- if (name != null) {
- getMethodContexWithIndex(refactoringContext, translationUnit, name, context, pm);
- }
+ getMethodContexWithIndex(refactoringContext, translationUnit, name, context, pm);
return context;
}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/SelectionHelper.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/SelectionHelper.java
index 0d5cd13e8b..9fcad7bdd4 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/SelectionHelper.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/SelectionHelper.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2016 Institute for Software, HSR Hochschule fuer Technik
+ * Copyright (c) 2008, 2012 Institute for Software, HSR Hochschule fuer Technik
* Rapperswil, University of applied sciences and others
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -9,7 +9,6 @@
* Contributors:
* Institute for Software - initial API and implementation
* Sergey Prigogin (Google)
- * Thomas Corbat (IFS)
*******************************************************************************/
package org.eclipse.cdt.internal.ui.refactoring.utils;
@@ -96,14 +95,6 @@ public class SelectionHelper {
return node.isPartOfTranslationUnitFile() && isNodeInsideRegion(node, selection);
}
- public static boolean isSelectionInsideNode(IASTNode node, Region selection) {
- return node.isPartOfTranslationUnitFile() && isRegionInside(selection, getNodeSpan(node));
- }
-
- public static boolean nodeMatchesSelection(IASTNode node, Region region) {
- return getNodeSpan(node).equals(region);
- }
-
protected static Region getNodeSpan(IASTNode region) {
int start = Integer.MAX_VALUE;
int nodeLength = 0;

Back to the top