mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-07 17:56:01 +02:00
Code Issues Wiki Activity

Bugfix for asm editor exception

Browse source
This commit is contained in:
Sebastien Marineau 2002-08-26 22:10:35 +00:00
parent bb6ac7102c
commit 43f276c433
1 changed files with 37 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmPartitionScanner.java
View file

@ -8,6 +8,8 @@ package org.eclipse.cdt.internal.ui.editor.asm;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.eclipse.jface.text.rules.ICharacterScanner;
import org.eclipse.jface.text.rules.IPredicateRule;
import org.eclipse.jface.text.rules.IRule; import org.eclipse.jface.text.rules.IRule;
import org.eclipse.jface.text.rules.IToken; import org.eclipse.jface.text.rules.IToken;
import org.eclipse.jface.text.rules.IWordDetector; import org.eclipse.jface.text.rules.IWordDetector;
@ -52,6 +54,37 @@ public class AsmPartitionScanner extends RuleBasedPartitionScanner {
} }
}; };
/**
* Word rule for empty comments.
*/
static class EmptyCommentRule extends WordRule implements IPredicateRule {
private IToken fSuccessToken;
/**
* Constructor for EmptyCommentRule.
* @param defaultToken
*/
public EmptyCommentRule(IToken successToken) {
super(new EmptyCommentDetector());
fSuccessToken= successToken;
addWord("/**/", fSuccessToken); //$NON-NLS-1$
}
/*
* @see IPredicateRule#evaluate(ICharacterScanner, boolean)
*/
public IToken evaluate(ICharacterScanner scanner, boolean resume) {
return evaluate(scanner);
}
/*
* @see IPredicateRule#getSuccessToken()
*/
public IToken getSuccessToken() {
return fSuccessToken;
}
};
/** /**
* Creates the partitioner and sets up the appropriate rules. * Creates the partitioner and sets up the appropriate rules.
@ -77,10 +110,7 @@ public class AsmPartitionScanner extends RuleBasedPartitionScanner {
//rules.add(new SingleLineRule("\"", "\"", Token.UNDEFINED, '\\')); //rules.add(new SingleLineRule("\"", "\"", Token.UNDEFINED, '\\'));
//rules.add(new SingleLineRule("'", "'", Token.UNDEFINED, '\\')); //rules.add(new SingleLineRule("'", "'", Token.UNDEFINED, '\\'));
EmptyCommentRule wordRule= new EmptyCommentRule(comment);
// Add special case word rule.
WordRule wordRule= new WordRule(new EmptyCommentDetector());
wordRule.addWord("/**/", comment);
rules.add(wordRule); rules.add(wordRule);
@ -88,8 +118,8 @@ public class AsmPartitionScanner extends RuleBasedPartitionScanner {
rules.add(new MultiLineRule("/*", "*/", comment)); rules.add(new MultiLineRule("/*", "*/", comment));
IRule[] result= new IRule[rules.size()]; IPredicateRule[] result= new IPredicateRule[rules.size()];
rules.toArray(result); rules.toArray(result);
setRules(result); setPredicateRules(result);
} }
} }