Menu
▾
▴
[E-p-i-c-commits] org.epic.ext.cbg.editor/src/cbg/editor ColoringPartitionScanner.java,1.4,1.5 ColoringEditorTools.java,1.6,1.7
|
From: Jochen L. <lue...@us...> - 2005-01-20 17:29:39
|
Update of /cvsroot/e-p-i-c/org.epic.ext.cbg.editor/src/cbg/editor In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6157/src/cbg/editor Modified Files: ColoringPartitionScanner.java ColoringEditorTools.java Log Message: Rule extensions and proper Handling of HERE-Documents Index: ColoringEditorTools.java =================================================================== RCS file: /cvsroot/e-p-i-c/org.epic.ext.cbg.editor/src/cbg/editor/ColoringEditorTools.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- ColoringEditorTools.java 25 Dec 2004 08:35:03 -0000 1.6 +++ ColoringEditorTools.java 20 Jan 2005 17:29:30 -0000 1.7 @@ -64,7 +64,7 @@ pat = new ExtendedPatternRule(span.getStart(), span.getEnd(), defaultToken, mode.getDefaultRuleSet().getEscape(), span.noLineBreak(), span.noMaxChar(), span.getGroupContent() , span.matchBracket(), span.noMultipleEndTag(), span.requireEndTag(), ignoreCase, span.dynamicTagging(), - span.getBeforeTag(), span.getAfterTag(),myWhitespaceDetector); + span.getCountDelimterChars(), span.getBeforeTag(), span.getAfterTag(),myWhitespaceDetector); } else { //the last parameter makes a default handling, //i.e. if the End-Tag is missing => mark till the end of File Index: ColoringPartitionScanner.java =================================================================== RCS file: /cvsroot/e-p-i-c/org.epic.ext.cbg.editor/src/cbg/editor/ColoringPartitionScanner.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- ColoringPartitionScanner.java 10 Jul 2004 07:55:12 -0000 1.4 +++ ColoringPartitionScanner.java 20 Jan 2005 17:29:30 -0000 1.5 @@ -1,122 +1,135 @@ -package cbg.editor; - -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.jface.text.BadLocationException; -import org.eclipse.jface.text.rules.ICharacterScanner; -import org.eclipse.jface.text.rules.IPredicateRule; -import org.eclipse.jface.text.rules.IToken; -import org.eclipse.jface.text.rules.RuleBasedPartitionScanner; -import cbg.editor.jedit.Mode; -import cbg.editor.jedit.Rule; -import cbg.editor.jedit.Type; -import cbg.editor.rules.CToken; -import cbg.editor.rules.ITokenFactory; - -public class ColoringPartitionScanner extends RuleBasedPartitionScanner { - public static final String NULL = "NULL"; - public final static String COMMENT1 = "COMMENT1"; - public final static String COMMENT2 = "COMMENT2"; - public static final String LITERAL1 = "LITERAL1"; - public static final String LITERAL2 = "LITERAL2"; - public static final String LABEL = "LABEL"; - public final static String KEYWORD1 = "KEYWORD1"; - public static final String KEYWORD2 = "KEYWORD2"; - public static final String KEYWORD3 = "KEYWORD3"; - public static final String FUNCTION = "FUNCTION"; - public static final String MARKUP = "MARKUP"; - public static final String OPERATOR = "OPERATOR"; - public static final String DIGIT = "DIGIT"; - public static final String INVALID = "INVALID"; - protected Mode mode; - protected int markLength = -1; - protected char escape; - - class LitePartitionScanner extends RuleBasedPartitionScanner { - public int getOffset() { - return fOffset; - } - public void setTokenOffset(int off) { - fTokenOffset = off; - } - public void setOffset(int off) { - fOffset = off; - } - } - - /** - * This will setup the rules for elements *not* defined as - * children of the keywords elements. - * JEdit allows the "type" of an element to appear inside the - * keywords element or outside. For example you could have the - * LITERAL2 tag inside the keywords element and as a top level - * element. - */ - public ColoringPartitionScanner(String filename) { - this(Modes.getModeFor(filename)); - } - - public ColoringPartitionScanner(Mode mode) { - super(); - this.mode = mode; - escape = mode.getDefaultRuleSet().getEscape(); - setPredicateRules(createRuleSet(mode.getDefaultRuleSet())); - } - - private IPredicateRule[] createRuleSet(Rule rule) { - List rules = new ArrayList(); - ColoringEditorTools.add(rule, rules, new ITokenFactory() { - public IToken makeToken(Type type) { - return new CToken(type); - } - }); - return (IPredicateRule[]) rules.toArray(new IPredicateRule[rules.size()]); - } - - - public int getTokenLength() { - if(markLength != -1) { - int length = markLength; - markLength = -1; - return length; - } - return super.getTokenLength(); - } - - public int getOffset() { - return fOffset; - } - - public void setOffset(int loc) { - fOffset = loc; - } - public void setMarkLength(int length) { - markLength = length; - } - public String[] getContentTypes() { - return mode.getContentTypes(); - } - - public int backup() { - --fOffset; - if (fOffset > -1) { - try { - return fDocument.getChar(fOffset); - } catch(BadLocationException bl) {} - } else { - fOffset = 0; - } - return ICharacterScanner.EOF; - } - - /** Move the token offset by a delta. - * - * @param delta - a positive or negative amount to move the token offset. - * @nonapi - */ - public void moveTokenOffset(int delta) { - fTokenOffset = fTokenOffset + delta; - } - +package cbg.editor; + +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.jface.text.BadLocationException; +import org.eclipse.jface.text.rules.ICharacterScanner; +import org.eclipse.jface.text.rules.IPredicateRule; +import org.eclipse.jface.text.rules.IToken; +import org.eclipse.jface.text.rules.RuleBasedPartitionScanner; +import cbg.editor.jedit.Mode; +import cbg.editor.jedit.Rule; +import cbg.editor.jedit.Type; +import cbg.editor.rules.CToken; +import cbg.editor.rules.ITokenFactory; + +public class ColoringPartitionScanner extends RuleBasedPartitionScanner { + public static final String NULL = "NULL"; + public final static String COMMENT1 = "COMMENT1"; + public final static String COMMENT2 = "COMMENT2"; + public static final String LITERAL1 = "LITERAL1"; + public static final String LITERAL2 = "LITERAL2"; + public static final String LABEL = "LABEL"; + public final static String KEYWORD1 = "KEYWORD1"; + public static final String KEYWORD2 = "KEYWORD2"; + public static final String KEYWORD3 = "KEYWORD3"; + public static final String FUNCTION = "FUNCTION"; + public static final String MARKUP = "MARKUP"; + public static final String OPERATOR = "OPERATOR"; + public static final String DIGIT = "DIGIT"; + public static final String INVALID = "INVALID"; + protected Mode mode; + protected int markLength = -1; + protected char escape; + + class LitePartitionScanner extends RuleBasedPartitionScanner { + public int getOffset() { + return fOffset; + } + public void setTokenOffset(int off) { + fTokenOffset = off; + } + public void setOffset(int off) { + fOffset = off; + } + } + + /** + * This will setup the rules for elements *not* defined as + * children of the keywords elements. + * JEdit allows the "type" of an element to appear inside the + * keywords element or outside. For example you could have the + * LITERAL2 tag inside the keywords element and as a top level + * element. + */ + public ColoringPartitionScanner(String filename) { + this(Modes.getModeFor(filename)); + } + + public ColoringPartitionScanner(Mode mode) { + super(); + this.mode = mode; + escape = mode.getDefaultRuleSet().getEscape(); + setPredicateRules(createRuleSet(mode.getDefaultRuleSet())); + } + + private IPredicateRule[] createRuleSet(Rule rule) { + List rules = new ArrayList(); + ColoringEditorTools.add(rule, rules, new ITokenFactory() { + public IToken makeToken(Type type) { + return new CToken(type); + } + }); + return (IPredicateRule[]) rules.toArray(new IPredicateRule[rules.size()]); + } + + + public int getTokenLength() { + if(markLength != -1) { + int length = markLength; + markLength = -1; + return length; + } + return super.getTokenLength(); + } + + public int getOffset() { + return fOffset; + } + + public void setOffset(int loc) { + fOffset = loc; + } + public void setMarkLength(int length) { + markLength = length; + } + public String[] getContentTypes() { + return mode.getContentTypes(); + } + + public int backup() { + --fOffset; + if (fOffset > -1) { + try { + return fDocument.getChar(fOffset); + } catch(BadLocationException bl) {} + } else { + fOffset = 0; + } + return ICharacterScanner.EOF; + } + + /** Move the token offset by a delta. + * + * @param delta - a positive or negative amount to move the token offset. + * @nonapi + */ + public void moveTokenOffset(int delta) { + fTokenOffset = fTokenOffset + delta; + } + + public String getCurrentLineDelimiter() { + try { + String myTemp=fDocument.getLineDelimiter(0); + if (myTemp == null) { + myTemp = System.getProperty("line.separator"); + } + return myTemp; + } catch (BadLocationException e) { + // no LineFeed up till now => use as default the System-Properties + return System.getProperty("line.separator"); + } + } + } \ No newline at end of file |