Bug 456099. Added change description.

core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/rename/RenameMoveHeaderRefactoringTest.java

@@ -277,47 +277,47 @@ public class RenameMoveHeaderRefactoringTest extends RefactoringTestBase {
 		compareFiles();
 	}
 
-	// original-class.h
+	// my-class.h
-	//#ifndef ORIGINAL_CLASS_H_
+	//#ifndef MY_CLASS_H_
-	//#define ORIGINAL_CLASS_H_
+	//#define MY_CLASS_H_
 	//
-	//class OriginalClass {};
+	//class MyClass {};
 	//
-	//#endif // ORIGINAL_CLASS_H_
+	//#endif // MY_CLASS_H_
 	//====================
-	// renamed-class.h
+	// my-new-class.h
-	//#ifndef RENAMED_CLASS_H_
+	//#ifndef MY_NEW_CLASS_H_
-	//#define RENAMED_CLASS_H_
+	//#define MY_NEW_CLASS_H_
 	//
-	//class RenamedClass {};
+	//class MyNewClass {};
 	//
-	//#endif // RENAMED_CLASS_H_
+	//#endif // MY_NEW_CLASS_H_
 
-	// original-class.cpp
+	// my-class.cpp
-	//#include "original-class.h"
+	//#include "my-class.h"
 	//
 	//#include <cstdio>
 	//====================
-	// renamed-class.cpp
+	// my-new-class.cpp
-	//#include "renamed-class.h"
+	//#include "my-new-class.h"
 	//
 	//#include <cstdio>
 
-	// original-class_test.cpp
+	// my-class_test.cpp
-	//#include "original-class.h"
+	//#include "my-class.h"
 	//====================
-	// renamed-class_test.cpp
+	// my-new-class_test.cpp
-	//#include "renamed-class.h"
+	//#include "my-new-class.h"
 
 	// some-other-file.cpp
-	//#include "original-class.h"
+	//#include "my-class.h"
-	///*$*/OriginalClass/*$$*/ a;
+	///*$*/MyClass/*$$*/ a;
 	//====================
 	// some-other-file.cpp
-	//#include "renamed-class.h"
+	//#include "my-new-class.h"
-	//RenamedClass a;
+	//MyNewClass a;
 	public void testClassRename() throws Exception {
-		executeRenameRefactoring("RenamedClass", true);
+		executeRenameRefactoring("MyNewClass", true);
 		compareFiles();
 	}
 }

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRefactoringMatch.java

@@ -25,11 +25,11 @@ public class CRefactoringMatch {
     public static final int IN_COMMENT = 4;
 
     private static String[] LABELS= {
-        RenameMessages.CRefactoringMatch_label_potentialOccurrence,
+        RenameMessages.CRefactoringMatch_label_potentialOccurrences,
-        RenameMessages.CRefactoringMatch_label_occurrence,
+        RenameMessages.CRefactoringMatch_label_occurrences,
         "", //$NON-NLS-1$
-        RenameMessages.CRefactoringMatch_label_potentialOccurrence,
+        RenameMessages.CRefactoringMatch_label_potentialOccurrences,
-        RenameMessages.CRefactoringMatch_label_comment };
+        RenameMessages.CRefactoringMatch_label_inComment };
 
     private IFile fFile;
     private int fOffset;

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/HeaderFileReferenceAdjuster.java

@@ -46,6 +46,7 @@ import org.eclipse.text.edits.InsertEdit;
 import org.eclipse.text.edits.MultiTextEdit;
 import org.eclipse.text.edits.ReplaceEdit;
 import org.eclipse.text.edits.TextEdit;
+import org.eclipse.text.edits.TextEditGroup;
 
 import org.eclipse.cdt.core.CCorePlugin;
 import org.eclipse.cdt.core.dom.ast.IASTComment;
@@ -183,16 +184,25 @@ public class HeaderFileReferenceAdjuster {
 
 	private void addFileChange(ITranslationUnit tu, List<Change> changes, ValidateEditChecker checker,
 			IProgressMonitor pm) throws CoreException {
-		TextEdit edit = createEdit(tu, pm);
+		TextEditGroup editGroup = createEdit(tu, pm);
-		if (edit != null) {
+		if (editGroup != null) {
 			CTextFileChange fileChange = new CTextFileChange(tu.getElementName(), tu);
-			fileChange.setEdit(edit);
+			TextEdit[] edits = editGroup.getTextEdits();
+			if (edits.length == 1) {
+				fileChange.setEdit(edits[0]);
+			} else {
+				fileChange.setEdit(new MultiTextEdit());
+				for (TextEdit edit : edits) {
+					fileChange.addEdit(edit);
+				}
+			}
+            fileChange.addTextEditGroup(editGroup);
 			changes.add(fileChange);
 			checker.addFile(fileChange.getFile());
 		}
 	}
 
-	private TextEdit createEdit(ITranslationUnit tu, IProgressMonitor pm)
+	private TextEditGroup createEdit(ITranslationUnit tu, IProgressMonitor pm)
 			throws CoreException, OperationCanceledException {
 		checkCanceled(pm);
 
@@ -205,7 +215,7 @@ public class HeaderFileReferenceAdjuster {
 		}
     }
 
-	private TextEdit createEdit(IASTTranslationUnit ast, ITranslationUnit tu, IProgressMonitor pm)
+	private TextEditGroup createEdit(IASTTranslationUnit ast, ITranslationUnit tu, IProgressMonitor pm)
 			throws CoreException, OperationCanceledException {
 		IncludeCreationContext context = new IncludeCreationContext(tu, index);
 		// Adjust the translation unit location in the inclusion context.
@@ -216,6 +226,7 @@ public class HeaderFileReferenceAdjuster {
 		String contents = context.getSourceContents();
 
 		MultiTextEdit rootEdit = createIncludeGuardEdit(ast, tu, contents);
+		int numIncludeGuardEdits = rootEdit == null ? 0 : rootEdit.getChildrenSize();
 
 		Map<IASTPreprocessorIncludeStatement, IPath> affectedIncludes = new IdentityHashMap<>();
 		IASTPreprocessorIncludeStatement[] existingIncludes = ast.getIncludeDirectives();
@@ -240,9 +251,7 @@ public class HeaderFileReferenceAdjuster {
 				}
 			}
 		}
-		if (affectedIncludes.isEmpty())
+		if (!affectedIncludes.isEmpty()) {
-			return rootEdit;
-
 			NodeCommentMap commentedNodeMap = ASTCommenter.getCommentedNodeMap(ast);
 			IRegion includeRegion =
 					IncludeUtil.getSafeIncludeReplacementRegion(contents, ast, commentedNodeMap);
@@ -384,8 +393,21 @@ public class HeaderFileReferenceAdjuster {
 					rootEdit.addChild(new ReplaceEdit(offset, length, includeInfo.toString()));
 				}
 			}
+		}
 
-		return rootEdit;
+		if (rootEdit == null)
+			return null;
+
+		int numEdits = rootEdit.getChildrenSize();
+		String message =
+				numEdits == numIncludeGuardEdits ?
+						RenameMessages.HeaderReferenceAdjuster_update_include_guards :
+				numIncludeGuardEdits == 0 ?
+						RenameMessages.HeaderReferenceAdjuster_update_includes :
+						RenameMessages.HeaderReferenceAdjuster_update_include_guards_and_includes;
+        TextEditGroup editGroup= new TextEditGroup(message, rootEdit);
+
+		return editGroup;
 	}
 
 	private static boolean isBlankLineNeededBetween(StyledInclude include1, StyledInclude include2,

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameMessages.java

@@ -22,9 +22,9 @@ class RenameMessages extends NLS {
 	public static String ASTManager_warning_parsingError_withFile;
 	public static String ASTManager_warning_parsingError_withFileAndLine;
 	public static String ASTManager_warning_parsingError;
-	public static String CRefactoringMatch_label_comment;
+	public static String CRefactoringMatch_label_inComment;
-	public static String CRefactoringMatch_label_occurrence;
+	public static String CRefactoringMatch_label_occurrences;
-	public static String CRefactoringMatch_label_potentialOccurrence;
+	public static String CRefactoringMatch_label_potentialOccurrences;
 	public static String CRefactory_title_rename;
 	public static String CRenameIncludeProcessor_includeDirective;
 	public static String CRenameLocalProcessor_constructor;
@@ -99,6 +99,9 @@ class RenameMessages extends NLS {
 	public static String CRenameTopProcessor_wizard_title;
 	public static String HeaderFileMoveParticipant_name;
 	public static String HeaderFileRenameParticipant_name;
+	public static String HeaderReferenceAdjuster_update_include_guards;
+	public static String HeaderReferenceAdjuster_update_includes;
+	public static String HeaderReferenceAdjuster_update_include_guards_and_includes;
 	public static String RenameCSourceFolderChange_ErrorMsg;
 	public static String RenameCSourceFolderChange_Name0;
 	public static String SourceFolderRenameParticipant_name;
@@ -124,7 +127,7 @@ class RenameMessages extends NLS {
 		NLS.initializeMessages(RenameMessages.class.getName(), RenameMessages.class);
 	}
 
-	// Do not instantiate
+	// Do not instantiate.
 	private RenameMessages() {
 	}
 }

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameMessages.properties

@@ -18,9 +18,9 @@ ASTManager_warning_parsingError_detailed=Parsing error - {0} -
 ASTManager_warning_parsingError_withFile={0} in file ''{1}''
 ASTManager_warning_parsingError_withFileAndLine={0} in file ''{1}'' at line ''{2}''
 ASTManager_warning_parsingError=Parsing error
-CRefactoringMatch_label_comment=Rename in comment
+CRefactoringMatch_label_inComment=Rename in comment
-CRefactoringMatch_label_occurrence=Rename occurrence
+CRefactoringMatch_label_occurrences=Rename occurrences
-CRefactoringMatch_label_potentialOccurrence=Rename potential occurrence
+CRefactoringMatch_label_potentialOccurrences=Rename potential occurrences
 CRefactory_title_rename=Rename
 CRenameIncludeProcessor_includeDirective=include directive
 CRenameLocalProcessor_constructor=Constructor
@@ -95,6 +95,9 @@ CRenameTopProcessor_wizard_backup_title=Rename
 CRenameTopProcessor_wizard_title=Rename ''{0}''
 HeaderFileMoveParticipant_name=Header File Move
 HeaderFileRenameParticipant_name=Header File Rename
+HeaderReferenceAdjuster_update_include_guards=Update include guards
+HeaderReferenceAdjuster_update_includes=Update includes
+HeaderReferenceAdjuster_update_include_guards_and_includes=Update include guards and includes
 RenameCSourceFolderChange_ErrorMsg=Folder {0} does not exist
 RenameCSourceFolderChange_Name0=Rename source folder {0} to {1}
 SourceFolderRenameParticipant_name=Rename C/C++ Source Folder