add getTokenMarker(code) for better file type flexibility; also clean up formatting

benfry · benfry · commit 00fe52d3b4c7 · 2016-08-08T23:05:49.000-04:00
diff --git a/app/src/processing/app/Mode.java b/app/src/processing/app/Mode.java
@@ -734,14 +734,22 @@ public String lookupReference(String keyword) {
   }
 
 
-  //public TokenMarker getTokenMarker() throws IOException {
-  //  File keywordsFile = new File(folder, "keywords.txt");
-  //  return new PdeKeywords(keywordsFile);
-  //}
+  /**
+   * Specialized version of getTokenMarker() that can be overridden to
+   * provide different TokenMarker objects for different file types.
+   * @since 3.2
+   * @param code the code for which we need a TokenMarker
+   */
+  public TokenMarker getTokenMarker(SketchCode code) {
+    return getTokenMarker();
+  }
+
+
   public TokenMarker getTokenMarker() {
     return tokenMarker;
   }
 
+
   protected TokenMarker createTokenMarker() {
     return new PdeKeywords();
   }
diff --git a/app/src/processing/app/syntax/KeywordMap.java b/app/src/processing/app/syntax/KeywordMap.java
@@ -32,7 +32,7 @@ public class KeywordMap {
 
   // A value of 52 will give good performance for most maps.
   static private int MAP_LENGTH = 52;
-  
+
   /**
    * Creates a new <code>KeywordMap</code>.
    * @param ignoreCase True if keys are case insensitive
@@ -84,8 +84,8 @@ public byte lookup(Segment text, int offset, int length, boolean paren) {
     }
     return Token.NULL;
   }
-  
-  
+
+
   /**
    * Checks if a subregion of a <code>Segment</code> is equal to a
    * character array.
@@ -98,20 +98,20 @@ static public boolean regionMatches(boolean ignoreCase, Segment text,
                                       int offset, char[] match) {
     int length = offset + match.length;
     char[] textArray = text.array;
-    if(length > text.offset + text.count)
+    if (length > text.offset + text.count) {
       return false;
-    for(int i = offset, j = 0; i < length; i++, j++)
-      {
-        char c1 = textArray[i];
-        char c2 = match[j];
-        if(ignoreCase)
-          {
-            c1 = Character.toUpperCase(c1);
-            c2 = Character.toUpperCase(c2);
-          }
-        if(c1 != c2)
-          return false;
+    }
+    for (int i = offset, j = 0; i < length; i++, j++) {
+      char c1 = textArray[i];
+      char c2 = match[j];
+      if (ignoreCase) {
+        c1 = Character.toUpperCase(c1);
+        c2 = Character.toUpperCase(c2);
+      }
+      if (c1 != c2) {
+        return false;
       }
+    }
     return true;
   }
 
@@ -127,7 +127,7 @@ public void add(String keyword, byte id, boolean paren) {
     map[key] = new Keyword(keyword.toCharArray(), id, map[key]);
   }
 
-  
+
   /**
    * Returns true if the keyword map is set to be case insensitive,
    * false otherwise.
@@ -136,7 +136,7 @@ public boolean getIgnoreCase() {
     return ignoreCase;
   }
 
-  
+
   /**
    * Sets if the keyword map should be case insensitive.
    * @param ignoreCase True if the keyword map should be case
@@ -146,21 +146,21 @@ public void setIgnoreCase(boolean ignoreCase) {
     this.ignoreCase = ignoreCase;
   }
 
-  
+
   protected int getStringMapKey(String s) {
     return (Character.toUpperCase(s.charAt(0)) +
       Character.toUpperCase(s.charAt(s.length()-1)))
       % MAP_LENGTH;
   }
 
-  
+
   protected int getSegmentMapKey(Segment s, int off, int len) {
     return (Character.toUpperCase(s.array[off]) +
       Character.toUpperCase(s.array[off + len - 1]))
       % MAP_LENGTH;
   }
 
-  
+
   // private members
   private static class Keyword {
     public final char[] keyword;
diff --git a/app/src/processing/app/syntax/TextAreaDefaults.java b/app/src/processing/app/syntax/TextAreaDefaults.java
@@ -18,21 +18,17 @@
  * creating the text area is that this method is faster.
  */
 public class TextAreaDefaults {
-  // For 3.0a6, the InputHandler object was broken out because it has little
-  // to do with this code and created circuitous connections between classes. 
-  //public InputHandler inputHandler;
-  
   public SyntaxDocument document;
 
   public boolean caretVisible;
   public boolean caretBlinks;
   public boolean blockCaret;
   public int electricScroll;
 
-  // default/preferred number of rows/cols 
+  // default/preferred number of rows/cols
   public int cols;
   public int rows;
-  
+
   public SyntaxStyle[] styles;
   public Color caretColor;
   public Color selectionColor;
diff --git a/app/src/processing/app/ui/Editor.java b/app/src/processing/app/ui/Editor.java
@@ -1805,7 +1805,7 @@ public void endCompoundEdit() {
       code.setDocument(document);
 
       // turn on syntax highlighting
-      document.setTokenMarker(mode.getTokenMarker());
+      document.setTokenMarker(mode.getTokenMarker(code));
 
       // insert the program text into the document object
       try {
diff --git a/todo.txt b/todo.txt
@@ -27,6 +27,8 @@ _ allow modes to specify their own base file name
 _   need to move "is this a sketch?" handling into Mode
 _ favicon handling for p5jsMode
 _ move template subst code to Util
+_ in Mode: TokenMarker getTokenMarker(SketchCode code)
+_   passes through to no args version if not overridden
 
 _ modify line number color when no lines extend that far?
 _   https://github.com/processing/processing/pull/4560
