change 3 space to 2 space

Author: tranleduy2000

.gitignore

@@ -68,5 +68,3 @@ src/androidTest/
 /sample/snake-game-in-turboPascal-master/
 /sample/sphinx-astar-master/
 *.apk
-/libCompiler/src/main/res/layout/highlight_setting.xml
-/libCompiler/src/main/java/com/duy/pascal/frontend/editor/setting/

libCompiler/.gitignore

@@ -1,2 +1 @@
 /build
-/src/main/java/com/duy/pascal/frontend/editor/setting/

libCompiler/src/main/java/com/duy/pascal/backend/tokenizer/IndentCode.java

@@ -92,7 +92,7 @@ public class IndentCode {
 
 
     private static final String TAG = "IndentCode";
-    private static final String THE_TAB = "   "; //3 space
+    private static final String THE_TAB = "  "; //2 space
     private int mode;
     private Reader source;
 

libCompiler/src/main/java/com/duy/pascal/frontend/editor/highlight/CodeHighlighter.java

@@ -166,36 +166,44 @@ private void highlightOther(@NonNull Editable allText,
 
 
         for (Matcher m = RGB_FUNCTION.matcher(textToHighlight); m.find(); ) {
-            int r = Integer.parseInt(m.group(3).trim());
-            int g = Integer.parseInt(m.group(5).trim());
-            int b = Integer.parseInt(m.group(7).trim());
-            int back = Color.rgb(r, g, b);
-            int fore = Color.rgb(255 - r, 255 - g, 255 - b);
+            try {
+                int r = Integer.parseInt(m.group(3).trim());
+                int g = Integer.parseInt(m.group(5).trim());
+                int b = Integer.parseInt(m.group(7).trim());
+                int back = Color.rgb(r, g, b);
+                int fore = Color.rgb(255 - r, 255 - g, 255 - b);
+
+                allText.setSpan(new BackgroundColorSpan(back),
+                        start + m.start(1),
+                        start + m.end(1),
+                        Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+                allText.setSpan(new ForegroundColorSpan(fore),
+                        start + m.start(1),
+                        start + m.end(1),
+                        Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+            } catch (Exception e) {
 
-            allText.setSpan(new BackgroundColorSpan(back),
-                    start + m.start(),
-                    start + m.end(),
-                    Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-            allText.setSpan(new ForegroundColorSpan(fore),
-                    start + m.start(),
-                    start + m.end(),
-                    Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+            }
         }
         for (Matcher m = ARGB_FUNCTION.matcher(textToHighlight); m.find(); ) {
-            int r = Integer.parseInt(m.group(5).trim());
-            int g = Integer.parseInt(m.group(7).trim());
-            int b = Integer.parseInt(m.group(9).trim());
-            int back = Color.rgb(r, g, b);
-            int fore = Color.rgb(255 - r, 255 - g, 255 - b);
+            try {
+                int r = Integer.parseInt(m.group(3).trim());
+                int g = Integer.parseInt(m.group(5).trim());
+                int b = Integer.parseInt(m.group(7).trim());
+                int back = Color.rgb(r, g, b);
+                int fore = Color.rgb(255 - r, 255 - g, 255 - b);
+
+                allText.setSpan(new BackgroundColorSpan(back),
+                        start + m.start(1),
+                        start + m.end(1),
+                        Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+                allText.setSpan(new ForegroundColorSpan(fore),
+                        start + m.start(1),
+                        start + m.end(1),
+                        Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+            } catch (Exception e) {
 
-            allText.setSpan(new BackgroundColorSpan(back),
-                    start + m.start(),
-                    start + m.end(),
-                    Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-            allText.setSpan(new ForegroundColorSpan(fore),
-                    start + m.start(),
-                    start + m.end(),
-                    Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+            }
         }
     }
 }

libCompiler/src/main/java/com/duy/pascal/frontend/editor/highlight/FastHighlight.java

@@ -830,17 +830,10 @@ public Editable highlight(Editable editable, boolean newText) {
             firstVisibleIndex = 0;
             lastVisibleIndex = CHARS_TO_COLOR;
         }
-        int delta = (lastVisibleIndex - firstVisibleIndex) / 3;
-        firstVisibleIndex -= delta;
-        lastVisibleIndex += delta;
-
         // normalize
-        if (firstVisibleIndex < 0)
-            firstVisibleIndex = 0;
-        if (lastVisibleIndex > editable.length())
-            lastVisibleIndex = editable.length();
-        if (firstVisibleIndex > lastVisibleIndex)
-            firstVisibleIndex = lastVisibleIndex;
+        if (firstVisibleIndex < 0) firstVisibleIndex = 0;
+        if (lastVisibleIndex > editable.length()) lastVisibleIndex = editable.length();
+        if (firstVisibleIndex > lastVisibleIndex) firstVisibleIndex = lastVisibleIndex;
 
         //clear all span for firstVisibleIndex to lastVisibleIndex
         clearSpans(editable, firstVisibleIndex, lastVisibleIndex);

libCompiler/src/main/java/com/duy/pascal/frontend/editor/view/HighlightEditor.java

@@ -76,7 +76,6 @@
             android:key="@string/key_code_theme"
             android:title="@string/theme" />
 
-
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/console_screen">