From 21d68daf5df58a0a7ee11957adfd433ea50485ef Mon Sep 17 00:00:00 2001 From: Marco Stornelli Date: Tue, 21 Apr 2020 18:20:49 +0200 Subject: [PATCH] Bug 562368 - Fix doxygen template documentation Change-Id: If0763d66fab13bc1cc7445363368df4c53546c24 (cherry picked from commit 8fa9f63e13d9bc207cbc13a6484fe52ec30b0abe) --- .../DoxygenCCommentAutoEditStrategyTest.java | 15 +++++++++++++++ core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF | 2 +- .../doxygen/DoxygenMultilineAutoEditStrategy.java | 2 +- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/doctools/doxygen/DoxygenCCommentAutoEditStrategyTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/doctools/doxygen/DoxygenCCommentAutoEditStrategyTest.java index 2674032ed48..17f8dd94b7b 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/doctools/doxygen/DoxygenCCommentAutoEditStrategyTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/doctools/doxygen/DoxygenCCommentAutoEditStrategyTest.java @@ -796,6 +796,21 @@ public class DoxygenCCommentAutoEditStrategyTest extends AbstractAutoEditTest { assertAutoEditBehaviour(); } + ///**X + //template + //T foo() {} + + ///** + // * X${whitespace_eol} + // * @tparam T + // * @return + // */ + //template + //T foo() {} + public void testTemplateParameters_Bug562368() throws CoreException { + assertAutoEditBehaviour(); + } + protected void assertAutoEditBehaviour() throws CoreException { CTextTools textTools = CUIPlugin.getDefault().getTextTools(); final IDocument doc = new Document(); diff --git a/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF index cd923f59d23..210d325d155 100644 --- a/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF +++ b/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.cdt.ui; singleton:=true -Bundle-Version: 6.7.0.qualifier +Bundle-Version: 6.7.1.qualifier Bundle-Activator: org.eclipse.cdt.ui.CUIPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/doxygen/DoxygenMultilineAutoEditStrategy.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/doxygen/DoxygenMultilineAutoEditStrategy.java index db8a825826b..40329ff19f9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/doxygen/DoxygenMultilineAutoEditStrategy.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/doxygen/DoxygenMultilineAutoEditStrategy.java @@ -206,7 +206,7 @@ public class DoxygenMultilineAutoEditStrategy extends DefaultMultilineCommentAut .append(ASTStringUtil.getSimpleName(decl.getName())) .append(ASTStringUtil.getSignatureString(null, decl)).append(getLineDelimiter()); } - result.append(getBriefTag()).append(getPrePostTag()).append(documentTemplateParameters(templateParams)); + result.append(getBriefTag()).append(getPrePostTag()); result.append(documentTemplateParameters(templateParams)); result.append(documentFunctionParameters(getParameterDecls(decl)));