mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-08 10:16:03 +02:00
Code Issues Wiki Activity

232988: apply fix

Browse source
This commit is contained in:
Andrew Ferguson 2008-05-21 13:58:58 +00:00
parent 3eb91c4fa0
commit a9dcca01fd
2 changed files with 111 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -413,6 +413,7 @@ public class DoxygenCCommentAutoEditStrategyTest extends DefaultCCommentAutoEdit
// public: // public:
// /** // /**
// * X // * X
// * @param x
// */ // */
// virtual void foo(D x); // virtual void foo(D x);
// }; // };
@ -420,6 +421,110 @@ public class DoxygenCCommentAutoEditStrategyTest extends DefaultCCommentAutoEdit
assertAutoEditBehaviour(); assertAutoEditBehaviour();
} }
// class A {};
// /**X
// A baz;
// class A {};
// /**
// * X
// */
// A baz;
public void testAutoDocCommentContent20() throws CoreException {
assertAutoEditBehaviour();
}
/** Declarations **/
// /**X
// int foo_bar();
// /**
// * X
// * @return
// */
// int foo_bar();
public void testAutoDocCommentContent3_Dec() throws CoreException {
assertAutoEditBehaviour();
}
// /** X
// int foo_bar();
// /**
// * X
// * @return
// */
// int foo_bar();
public void testAutoDocCommentContent4_Dec() throws CoreException {
assertAutoEditBehaviour();
}
// /**X
// *
// */
// int foo_bar();
// /**
// * X
// *
// */
// int foo_bar();
public void testAutoDocCommentContent5_Dec() throws CoreException {
assertAutoEditBehaviour();
}
// /**X
// void foo_bar(int x);
// /**
// * X
// * @param x
// */
// void foo_bar(int x);
public void testAutoDocCommentContent6_Dec() throws CoreException {
assertAutoEditBehaviour();
}
// class A {}; class B {};
// /**X
// C* bar_baz(A a, B b, int c);
// class A {}; class B {};
// /**
// * X
// * @param a
// * @param b
// * @param c
// * @return
// */
// C* bar_baz(A a, B b, int c);
public void testAutoDocCommentContent7_Dec() throws CoreException {
assertAutoEditBehaviour();
}
// #define STATIC static
//
// class D {
// public:
// /**X
// STATIC void D::foo(int x);
// };
// #define STATIC static
//
// class D {
// public:
// /**
// * X
// * @param x
// */
// STATIC void D::foo(int x);
// };
public void testAutoDocCommentContent17_Dec() 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();

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

@ -48,6 +48,7 @@ public class DoxygenMultilineAutoEditStrategy extends DefaultMultilineCommentAut
private static final String RETURN = "@return\n"; //$NON-NLS-1$ private static final String RETURN = "@return\n"; //$NON-NLS-1$
protected boolean documentPureVirtuals= true; protected boolean documentPureVirtuals= true;
protected boolean documentDeclarations= true;
public DoxygenMultilineAutoEditStrategy() { public DoxygenMultilineAutoEditStrategy() {
} }
@ -136,11 +137,12 @@ public class DoxygenMultilineAutoEditStrategy extends DefaultMultilineCommentAut
if(sdec.getDeclSpecifier() instanceof IASTCompositeTypeSpecifier) { if(sdec.getDeclSpecifier() instanceof IASTCompositeTypeSpecifier) {
return result; return result;
} else if(documentPureVirtuals && sdec.getDeclSpecifier() instanceof ICPPASTDeclSpecifier) { } else if(sdec.getDeclSpecifier() instanceof ICPPASTDeclSpecifier) {
IASTDeclarator[] dcs= sdec.getDeclarators(); IASTDeclarator[] dcs= sdec.getDeclarators();
if(dcs.length == 1) { if(dcs.length == 1 && dcs[0] instanceof ICPPASTFunctionDeclarator) {
ICPPASTFunctionDeclarator fdecl= (ICPPASTFunctionDeclarator) sdec.getDeclarators()[0]; ICPPASTFunctionDeclarator fdecl= (ICPPASTFunctionDeclarator) dcs[0];
if(fdecl.isPureVirtual()) { boolean shouldDocument= documentDeclarations || (documentPureVirtuals && fdecl.isPureVirtual());
if(shouldDocument) {
return documentFunction(fdecl, sdec.getDeclSpecifier()); return documentFunction(fdecl, sdec.getDeclSpecifier());
} }
} }