mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-21 21:52:10 +02:00
Code Issues Wiki Activity

Bug 562368 - Fix doxygen template documentation

Browse source 
Change-Id: If0763d66fab13bc1cc7445363368df4c53546c24
(cherry picked from commit 8fa9f63e13)
This commit is contained in:
Marco Stornelli 2020-04-21 18:20:49 +02:00
parent fa46a5085e
commit 21d68daf5d
3 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/doctools/doxygen/DoxygenCCommentAutoEditStrategyTest.java
View file

@ -796,6 +796,21 @@ public class DoxygenCCommentAutoEditStrategyTest extends AbstractAutoEditTest {
assertAutoEditBehaviour(); assertAutoEditBehaviour();
} }
///**X
//template<class T>
//T foo() {}
///**
// * X${whitespace_eol}
// * @tparam T
// * @return
// */
//template<class T>
//T foo() {}
public void testTemplateParameters_Bug562368() throws CoreException {
assertAutoEditBehaviour();
}
protected void assertAutoEditBehaviour() throws CoreException { protected void assertAutoEditBehaviour() throws CoreException {
CTextTools textTools = CUIPlugin.getDefault().getTextTools(); CTextTools textTools = CUIPlugin.getDefault().getTextTools();
final IDocument doc = new Document(); final IDocument doc = new Document();

2
core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF
View file

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: %pluginName Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.cdt.ui; singleton:=true 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-Activator: org.eclipse.cdt.ui.CUIPlugin
Bundle-Vendor: %providerName Bundle-Vendor: %providerName
Bundle-Localization: plugin Bundle-Localization: plugin

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/doxygen/DoxygenMultilineAutoEditStrategy.java
View file

@ -206,7 +206,7 @@ public class DoxygenMultilineAutoEditStrategy extends DefaultMultilineCommentAut
.append(ASTStringUtil.getSimpleName(decl.getName())) .append(ASTStringUtil.getSimpleName(decl.getName()))
.append(ASTStringUtil.getSignatureString(null, decl)).append(getLineDelimiter()); .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(documentTemplateParameters(templateParams));
result.append(documentFunctionParameters(getParameterDecls(decl))); result.append(documentFunctionParameters(getParameterDecls(decl)));