mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

233411: apply fix

Browse source
This commit is contained in:
Andrew Ferguson 2008-05-22 15:01:28 +00:00
parent 63089ab4e0
commit a7f2963f3c
1 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/DefaultMultilineCommentAutoEditStrategy.java
View file

@ -45,7 +45,7 @@ import org.eclipse.cdt.ui.IWorkingCopyManager;
import org.eclipse.cdt.ui.text.ICPartitions; import org.eclipse.cdt.ui.text.ICPartitions;
/** /**
* This class provides default behaviours for multi-line comment auto-editing. * This class provides default behaviors for multi-line comment auto-editing.
* *
* This class is intended to be sub-classed. * This class is intended to be sub-classed.
* *
@ -64,22 +64,27 @@ public class DefaultMultilineCommentAutoEditStrategy implements IAutoEditStrateg
*/ */
public void customizeDocumentCommand(IDocument doc, DocumentCommand cmd) { public void customizeDocumentCommand(IDocument doc, DocumentCommand cmd) {
if(doc instanceof IDocumentExtension4) { if(doc instanceof IDocumentExtension4) {
IDocumentExtension4 ext4= (IDocumentExtension4) doc; boolean forNewLine= cmd.length == 0 && cmd.text != null && endsWithDelimiter(doc, cmd.text);
DocumentRewriteSession drs= ext4.startRewriteSession(DocumentRewriteSessionType.UNRESTRICTED_SMALL); boolean forCommentEnd= "/".equals(cmd.text); //$NON-NLS-1$
try {
if (cmd.length == 0 && cmd.text != null && endsWithDelimiter(doc, cmd.text)) if(forNewLine || forCommentEnd) {
customizeDocumentAfterNewLine(doc, cmd); IDocumentExtension4 ext4= (IDocumentExtension4) doc;
else if ("/".equals(cmd.text)) { //$NON-NLS-1$ DocumentRewriteSession drs= ext4.startRewriteSession(DocumentRewriteSessionType.UNRESTRICTED_SMALL);
customizeDocumentForMultilineCommentEnd(doc, cmd); try {
if (forNewLine) {
customizeDocumentAfterNewLine(doc, cmd);
} else if (forCommentEnd) {
customizeDocumentForMultilineCommentEnd(doc, cmd);
}
} finally {
ext4.stopRewriteSession(drs);
} }
} finally {
ext4.stopRewriteSession(drs);
} }
} }
} }
/** /**
* This implements a rule that when in a multiline comment context typing a forward slash with * This implements a rule that when in a multi-line comment context typing a forward slash with
* one white space after the "*" will move eliminate the whitespace. * one white space after the "*" will move eliminate the whitespace.
* @param doc * @param doc
* @param command * @param command
@ -232,8 +237,8 @@ public class DefaultMultilineCommentAutoEditStrategy implements IAutoEditStrateg
} }
/** /**
* @return the ast unit for the active editor, or null if there is no active editor, or * @return the AST unit for the active editor, or null if there is no active editor, or
* the ast could not be obtained. * the AST could not be obtained.
*/ */
public IASTTranslationUnit getAST() { public IASTTranslationUnit getAST() {
final ITranslationUnit unit= getTranslationUnit(); final ITranslationUnit unit= getTranslationUnit();
@ -335,7 +340,7 @@ public class DefaultMultilineCommentAutoEditStrategy implements IAutoEditStrateg
/** /**
* Returns the offset of the first non-whitespace character in the specified document, searching * Returns the offset of the first non-whitespace character in the specified document, searching
* right/downward from the specified start offset up to the specified end offset. If there is * right/downward from the specified start offset up to the specified end offset. If there is
* no nonwhitespace then the end offset is returned. * no non-whitespace then the end offset is returned.
* @param document * @param document
* @param offset * @param offset
* @param end * @param end
@ -353,10 +358,10 @@ public class DefaultMultilineCommentAutoEditStrategy implements IAutoEditStrateg
} }
/** /**
* Returns the range of the Javadoc prefix on the given line in * Returns the range of the java-doc prefix on the given line in
* <code>document</code>. The prefix greedily matches the following regex * <code>document</code>. The prefix greedily matches the following regex
* pattern: <code>\w*\*\w*</code>, that is, any number of whitespace * pattern: <code>\w*\*\w*</code>, that is, any number of whitespace
* characters, followed by an asterix ('*'), followed by any number of * characters, followed by an asterisk ('*'), followed by any number of
* whitespace characters. * whitespace characters.
* *
* @param document the document to which <code>line</code> refers * @param document the document to which <code>line</code> refers