Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/RpmMacroProposalsListTest.java11
-rw-r--r--rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/RpmMacroProposalsList.java2
2 files changed, 12 insertions, 1 deletions
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/RpmMacroProposalsListTest.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/RpmMacroProposalsListTest.java
index e0315582a3..861852fb07 100644
--- a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/RpmMacroProposalsListTest.java
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/src/org/eclipse/linuxtools/rpm/ui/editor/tests/RpmMacroProposalsListTest.java
@@ -35,6 +35,17 @@ public class RpmMacroProposalsListTest {
if (!macroProposalsList.findKey("%_libdir"))
fail("buildMacroList faild, %_libdir macro was not found!");
}
+
+ /**
+ * Configure is the most common macro that is multi-line so it tests our parsing of multiline macros.
+ */
+ @Test
+ public final void buildMacroListMultiLineMacro() {
+ macroProposalsList.buildMacroList();
+ if (!macroProposalsList.findKey("%configure")) {
+ fail("buildMacroList faild, %configure macro was not found!");
+ }
+ }
@Test
public final void testGetProposals() {
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/RpmMacroProposalsList.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/RpmMacroProposalsList.java
index 202dd3e8ff..ee24a1487a 100644
--- a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/RpmMacroProposalsList.java
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/RpmMacroProposalsList.java
@@ -103,7 +103,7 @@ public class RpmMacroProposalsList {
isKeyLine = false;
key = item[0];
if (item.length > 1) {
- value += item[1].replaceAll("\\", "\n\n"); //$NON-NLS-1$//$NON-NLS-2$
+ value += item[1].replaceAll("\\\\", "\n\n"); //$NON-NLS-1$//$NON-NLS-2$
}
} else {
value += line.substring(0,

Back to the top