diff --git a/editor/org.processing.editor/META-INF/MANIFEST.MF b/editor/org.processing.editor/META-INF/MANIFEST.MF index 03c2870f6..7f2a5bd36 100644 --- a/editor/org.processing.editor/META-INF/MANIFEST.MF +++ b/editor/org.processing.editor/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: org.processing.editor Bundle-SymbolicName: org.processing.editor;singleton:=true -Bundle-Version: 0.0.0 +Bundle-Version: 0.0.1 Bundle-Activator: org.processing.editor.ProcessingEditorPlugin Require-Bundle: org.eclipse.core.runtime, org.eclipse.ui, diff --git a/editor/org.processing.editor/bin/org/processing/editor/ProcessingActionContributor.class b/editor/org.processing.editor/bin/org/processing/editor/ProcessingActionContributor.class index 2e89a14f1..222a810bb 100644 Binary files a/editor/org.processing.editor/bin/org/processing/editor/ProcessingActionContributor.class and b/editor/org.processing.editor/bin/org/processing/editor/ProcessingActionContributor.class differ diff --git a/editor/org.processing.editor/bin/org/processing/editor/ProcessingEditorPlugin.class b/editor/org.processing.editor/bin/org/processing/editor/ProcessingEditorPlugin.class index d5c3199f2..3b1903e59 100644 Binary files a/editor/org.processing.editor/bin/org/processing/editor/ProcessingEditorPlugin.class and b/editor/org.processing.editor/bin/org/processing/editor/ProcessingEditorPlugin.class differ diff --git a/editor/org.processing.editor/bin/org/processing/editor/ProcessingSourceViewerConfiguration$SingleTokenScanner.class b/editor/org.processing.editor/bin/org/processing/editor/ProcessingSourceViewerConfiguration$SingleTokenScanner.class index 5ea6dcf3f..6751f69b0 100644 Binary files a/editor/org.processing.editor/bin/org/processing/editor/ProcessingSourceViewerConfiguration$SingleTokenScanner.class and b/editor/org.processing.editor/bin/org/processing/editor/ProcessingSourceViewerConfiguration$SingleTokenScanner.class differ diff --git a/editor/org.processing.editor/bin/org/processing/editor/ProcessingSourceViewerConfiguration.class b/editor/org.processing.editor/bin/org/processing/editor/ProcessingSourceViewerConfiguration.class index 5bba5e704..3508a550b 100644 Binary files a/editor/org.processing.editor/bin/org/processing/editor/ProcessingSourceViewerConfiguration.class and b/editor/org.processing.editor/bin/org/processing/editor/ProcessingSourceViewerConfiguration.class differ diff --git a/editor/org.processing.editor/bin/org/processing/editor/language/ProcessingCodeScanner.class b/editor/org.processing.editor/bin/org/processing/editor/language/ProcessingCodeScanner.class index 2322c2286..7939b360b 100644 Binary files a/editor/org.processing.editor/bin/org/processing/editor/language/ProcessingCodeScanner.class and b/editor/org.processing.editor/bin/org/processing/editor/language/ProcessingCodeScanner.class differ diff --git a/editor/org.processing.editor/build.properties b/editor/org.processing.editor/build.properties index 0d3d3a745..6cf92e53c 100644 --- a/editor/org.processing.editor/build.properties +++ b/editor/org.processing.editor/build.properties @@ -3,4 +3,5 @@ output.. = bin/ bin.includes = plugin.xml,\ META-INF/,\ .,\ - icons/ + icons/,\ + keywords.txt diff --git a/editor/org.processing.editor/src/org/processing/editor/language/ProcessingCodeScanner.java b/editor/org.processing.editor/src/org/processing/editor/language/ProcessingCodeScanner.java index ee6b02381..81afef8ac 100644 --- a/editor/org.processing.editor/src/org/processing/editor/language/ProcessingCodeScanner.java +++ b/editor/org.processing.editor/src/org/processing/editor/language/ProcessingCodeScanner.java @@ -157,7 +157,8 @@ public class ProcessingCodeScanner extends RuleBasedScanner { wordRule.addWord(fgLabels[i], label); for (int i= 0; i < fgOperators.length; i++) wordRule.addWord(fgOperators[i], operator); - + for (int i= 0; i < fgInvalids.length; i++) + wordRule.addWord(fgInvalids[i], invalid); // Set these as the colorizing rules for the document rules.add(wordRule); diff --git a/editor/org.processing.editor/src/org/processing/editor/util/ProcessingColorProvider.java b/editor/org.processing.editor/src/org/processing/editor/util/ProcessingColorProvider.java index b4cb4c65c..65fa208c1 100644 --- a/editor/org.processing.editor/src/org/processing/editor/util/ProcessingColorProvider.java +++ b/editor/org.processing.editor/src/org/processing/editor/util/ProcessingColorProvider.java @@ -27,7 +27,7 @@ public class ProcessingColorProvider { public static final RGB KEYWORD1= new RGB(204, 102, 0); public static final RGB KEYWORD2= new RGB(204, 102, 0); public static final RGB KEYWORD3= new RGB(204, 102, 0); - public static final RGB LITERAL1= new RGB(0, 102, 153); // currently unused used [lonnen] june 16, 2010 + public static final RGB LITERAL1= new RGB(0, 102, 153); // currently unused [lonnen] june 16, 2010 public static final RGB LITERAL2= new RGB(0, 102, 153); public static final RGB LABEL= new RGB(0, 0, 128); // use listed as '?' in p5 doc public static final RGB OPERATOR= new RGB(0, 0, 0);