FIXED - bug 264712: Refactor extract function deletes comments in header

https://bugs.eclipse.org/bugs/show_bug.cgi?id=264712

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/commenthandler/ASTCommenter.java

@@ -85,24 +85,31 @@ public class ASTCommenter {
 	private static ArrayList<IASTComment> removeAllPreprocessorComments(IASTTranslationUnit tu, ArrayList<IASTComment> comments) {
 		IASTPreprocessorStatement[] preprocessorStatements = tu.getAllPreprocessorStatements();
 		TreeMap<Integer,String> treeOfPreProcessorLines = new TreeMap<Integer,String>();
-		ArrayList<Integer> listOfPreProcessorOffset = new ArrayList<Integer>();
+		TreeMap<String, ArrayList<Integer>> ppOffsetForFiles = new TreeMap<String, ArrayList<Integer>>();
 
 		for (IASTPreprocessorStatement statement : preprocessorStatements) {
 			if (isInWorkspace(statement)) {
-				treeOfPreProcessorLines.put(OffsetHelper.getStartingLineNumber(statement), statement.getFileLocation().getFileName());
+				String fileName = statement.getFileLocation().getFileName();
-				listOfPreProcessorOffset.add(statement.getFileLocation().getNodeOffset());
+				treeOfPreProcessorLines.put(OffsetHelper.getStartingLineNumber(statement), fileName);
+				ArrayList<Integer> offsetList = ppOffsetForFiles.get(fileName);
+				if(offsetList == null) {
+					offsetList = new ArrayList<Integer>();
+					ppOffsetForFiles.put(fileName, offsetList);
+				}
+				offsetList.add(statement.getFileLocation().getNodeOffset());
 			}
 		}
 
 		ArrayList<IASTComment> commentsInCode = new ArrayList<IASTComment>();
 		for (IASTComment comment : comments) {
 			int comStartLineNumber = OffsetHelper.getStartingLineNumber(comment);
+			String fileName = comment.getFileLocation().getFileName();
 			if (treeOfPreProcessorLines.containsKey(comStartLineNumber)
-					&& treeOfPreProcessorLines.get(comStartLineNumber).equals(comment.getFileLocation().getFileName()
+					&& treeOfPreProcessorLines.get(comStartLineNumber).equals(fileName
 					)) {
 					continue;
 			}
-			if(commentIsAtTheBeginningBeforePreprocessorStatements(comment, listOfPreProcessorOffset)) {
+			if(commentIsAtTheBeginningBeforePreprocessorStatements(comment, ppOffsetForFiles.get(fileName))) {
 				continue;
 			}
 			commentsInCode.add(comment);
@@ -113,7 +120,7 @@ public class ASTCommenter {
 	private static boolean commentIsAtTheBeginningBeforePreprocessorStatements(
 			IASTComment comment, 
 			ArrayList<Integer> listOfPreProcessorOffset) {
-		if(listOfPreProcessorOffset.size() <1) {
+		if(listOfPreProcessorOffset == null) {
 			return false;
 		}
 		
@@ -121,16 +128,22 @@ public class ASTCommenter {
 			return true;
 		}
 		IASTDeclaration decl = comment.getTranslationUnit().getDeclarations()[0];
-		if(decl.getFileLocation().getNodeOffset() < comment.getFileLocation().getNodeOffset()) {
+		boolean sameFile = decl.getFileLocation().getFileName().equals(comment.getFileLocation().getFileName());
-			return false;
+		if(sameFile) {
+			if(decl.getFileLocation().getNodeOffset() < comment.getFileLocation().getNodeOffset()) {
+				return false;
+			}
 		}
-		
 		Collections.sort(listOfPreProcessorOffset);
 		if(listOfPreProcessorOffset.get(0) < comment.getFileLocation().getNodeOffset()) {
 			return false;
 		}
 		
-		if(listOfPreProcessorOffset.get(0) < decl.getFileLocation().getNodeOffset()) {
+		if(sameFile) {
+			if(listOfPreProcessorOffset.get(0) < decl.getFileLocation().getNodeOffset()) {
+				return true;
+			}
+		}else {
 			return true; 
 		}
 

core/org.eclipse.cdt.ui.tests/resources/refactoring/ExtractMethod.rts

@@ -2592,3 +2592,117 @@ int main(int argc, char **argv) {
     exp();
 }
 
+//!Bug#264712 Refactor extract function deletes comments in header
+//#org.eclipse.cdt.ui.tests.refactoring.extractfunction.ExtractFunctionRefactoringTest
+//@.config
+filename=test.cpp
+methodname=exp
+//@classhelper.h
+// Comment
+//
+// Comment
+// Comment
+#ifndef utils_classhelper_h_seen
+#define utils_classhelper_h_seen
+#define IMPORTANT_VALUE 1
+#endif
+
+//@test.h
+/*
+ * Copyright 2009
+ */
+#ifndef test_h_seen
+#define test_h_seen
+
+#include "classhelper.h"
+
+class Test
+{
+  public:
+
+	/**
+	 * Small class with some comments
+	 */
+	Test();
+
+    /** Calculate important things.
+     * @returns the result of the calculation
+     */
+    int calculateStuff();
+
+  private:
+	/**
+	 * Retain a value for something.
+	 */
+    int m_value;
+
+};
+
+#endif
+
+//=
+/*
+ * Copyright 2009
+ */
+#ifndef test_h_seen
+#define test_h_seen
+
+#include "classhelper.h"
+
+class Test
+{
+  public:
+
+	/**
+	 * Small class with some comments
+	 */
+	Test();
+
+    /** Calculate important things.
+     * @returns the result of the calculation
+     */
+    int calculateStuff();
+
+  private:
+	/**
+	 * Retain a value for something.
+	 */
+    int m_value;
+    int exp();
+
+};
+
+#endif
+
+//@test.cpp
+#include "test.h"
+
+Test::Test() {}
+
+int Test::calculateStuff() {
+	// refactor these lines to a new method:
+	/*$*/int result = m_value;
+	result += 10;
+	result *= 10;/*$$*/
+	return result;
+}
+
+//=
+#include "test.h"
+
+Test::Test() {}
+
+int Test::exp()
+{
+    // refactor these lines to a new method:
+    int result = m_value;
+    result += 10;
+    result *= 10;
+    return result;
+}
+
+int Test::calculateStuff() {
+    int result = exp();
+	return result;
+}
+