Add astyle to editor module

Author: tranleduy2000

.idea/misc.xml

@@ -136,7 +136,6 @@ dependencies {
     api project(':emulatorview')
     api project(':libtermexec')
     api project(':style')
-    api project(':libastyle')
 
     implementation 'com.google.firebase:firebase-core:15.0.2'
     implementation 'com.google.firebase:firebase-storage:15.0.2'

app/build.gradle

@@ -5,13 +5,42 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import static junit.framework.Assert.assertTrue;
+
 @RunWith(AndroidJUnit4.class)
 public class AStyleInterfaceTest {
 
     @Test
     public void testCpp() {
-        String code = "int Foo(bool isBar){if (isBar)    {    bar();    return 1;    }else    return 0;}";
-        String format = AStyleInterface.format(code, "--style=allman");
-        System.out.println("format = " + format);
+        // options to pass to AStyle
+        // mode=java is required for Java files
+        String options = "-A2tOP";
+
+        String code = getSample();
+
+        System.out.println("before format");
+        System.out.println(code);
+
+        AStyleInterface astyle = new AStyleInterface();
+        String formatted = astyle.formatSource(code, options);
+
+        System.out.println("formatted = \n");
+        System.out.println(formatted);
+
+        assertTrue(formatted.length() != 0);
+    }
+
+    public String getSample() {
+        return "#include <iostream>\n" +
+                "using namespace std;\n" +
+                "\n" +
+                "int main() \n" +
+                "{" +
+                "cout << \"Size of char: \" << sizeof(char) << \" byte\" << endl;" +
+                "cout << \"Size of int: \" << sizeof(int) << \" bytes\" << endl;" +
+                "cout << \"Size of float: \" << sizeof(float) << \" bytes\" << endl;" +
+                "cout << \"Size of double: \" << sizeof(double) << \" bytes\" << endl;" +
+                "return 0;\n" +
+                "}";
     }
 }

app/src/androidTest/java/com/duy/astyle/AStyleInterfaceTest.java

@@ -24,7 +24,6 @@
 import android.view.SubMenu;
 import android.widget.Toast;
 
-import com.duy.astyle.AStyleInterface;
 import com.duy.ccppcompiler.BuildConfig;
 import com.duy.ccppcompiler.R;
 import com.duy.ccppcompiler.compiler.CompileManager;
@@ -70,11 +69,6 @@ protected void onCreate(Bundle savedInstanceState) {
         mPremiumHelper = new InAppPurchaseHelper(this);
         // Monitor launch times and interval from installation
         RateThisApp.onCreate(this);
-
-        String code = "int Foo(bool isBar){if (isBar)    {    bar();    return 1;    }else    return 0;}";
-        AStyleInterface aStyleInterface = new AStyleInterface();
-        String format = aStyleInterface.format(code, "--style=allman");
-        System.out.println("format = " + format);
     }
 
     @Override

app/src/main/java/com/duy/editor/CodeEditorActivity.java

@@ -47,5 +47,6 @@ dependencies {
     api group: 'commons-io', name: 'commons-io', version: '2.4'
 
     api project(':style')
+    api project(':libastyle')
 }
 

editor/build.gradle

@@ -67,7 +67,7 @@
 /**
  * @author Jecelyin Peng <jecelyin@gmail.com>
  */
-public class EditorDelegate implements TextWatcher {
+public class EditorDelegate implements TextWatcher, IEditorDelegate {
     public final static String KEY_CLUSTER = "is_cluster";
     private static final String TAG = "EditorDelegate";
     EditAreaView mEditText;
@@ -587,6 +587,7 @@ Parcelable onSaveInstanceState() {
         return savedState;
     }
 
+    @Override
     public Document getDocument() {
         return mDocument;
     }

editor/src/main/java/com/jecelyin/editor/v2/editor/EditorDelegate.java

@@ -0,0 +1,5 @@
+package com.jecelyin.editor.v2.editor;
+
+public interface IEditorDelegate {
+    Document getDocument();
+}

editor/src/main/java/com/jecelyin/editor/v2/editor/IEditorDelegate.java

@@ -1,7 +1,5 @@
 package com.duy.astyle;
 
-import android.util.Log;
-
 /**
  * AStyleInterface jni
  *
@@ -16,50 +14,82 @@ public class AStyleInterface {
     }
 
     /**
-     * This function is called to get the Artistic Style version number.
-     *
-     * @return A Java String containing the Artistic Style version number.
+     * Error message function for this example.
      */
-    public static native String AStyleGetVersion();
+    private static void error(String message) {
+        System.out.println(message);
+        System.out.println("The program has terminated!");
+        System.exit(1);
+    }
 
     /**
-     * This function is called to format the source code.
+     * Calls the Java AStyleMain function in Artistic Style.
+     * The function name is constructed from method names in this program.
      *
-     * @param textIn  - A string containing the source file to be formatted
-     * @param options A Java String containing the formatting options. They should be in the same
-     *                format as in the default options file. The options may be set apart by
-     *                new-lines, commas, tabs or spaces. The long options do not need the "--" prefix.
-     *                Comments may be used but they must be terminated by a new-line "\n" character.
-     *                <p>
-     *                If the file is not a C/C++ file, the file mode option "mode=java" or "mode=cs"
-     *                must be included.
-     *                Otherwise the default mode of C/C++ is used.
-     * @return If the function succeeds, the return value is a Java String containing the formatted
-     * source code.
-     * If the function fails, the return value is an empty Java String. The returned String should
-     * be checked for a length of zero to determine if an error occurred. Before the source is
-     * returned, an error message will be sent to the ErrorHandler method.
-     * <p>
-     * The function will NOT fail for an invalid option in the formatting options. In this case,
-     * an error message is sent to the error handling function and the formatted source code is
-     * returned without using the invalid option.
+     * @param textIn  A string containing the source code to be formatted.
+     * @param options A string of options to Artistic Style.
+     * @return A String containing the formatted source from Artistic Style.
      */
     private native String AStyleMain(String textIn, String options);
 
-
-    public String format(String code, String opts) {
-        return AStyleMain(code, opts);
-    }
+    /**
+     * Calls the Java AStyleGetVersion function in Artistic Style.
+     * The function name is constructed from method names in this program.
+     *
+     * @return A String containing the version number of Artistic Style.
+     */
+    private native String AStyleGetVersion();
 
     /**
-     * ErrorHandler is called by the Artistic Style static library when an error occurs. It should
-     * display an error message and then either abort or continue the program depending on the error.
+     * Error handler for messages from Artistic Style.
+     * This method is called only if there are errors when AStyleMain is called.
+     * This is for debugging and there should be no errors when the calling
+     * parameters are correct.
+     * Changing the method name requires changing Artistic Style.
+     * Signature: (ILjava/lang/String;)V.
      *
-     * @param errorNumber  The error number as defined by Artistic Style.
-     * @param errorMessage A Java String containing the error message as defined by Artistic Style.
+     * @param errorNumber  The error number from Artistic Style.
+     * @param errorMessage The error message from Artistic Style.
      */
     @SuppressWarnings("unused")
     private void ErrorHandler(int errorNumber, String errorMessage) {
-        Log.d(TAG, "ErrorHandler() called with: errorNumber = [" + errorNumber + "], errorMessage = [" + errorMessage + "]");
+        System.out.println("AStyle error "
+                + String.valueOf(errorNumber)
+                + " - " + errorMessage);
     }
+
+    /**
+     * Call the AStyleMain function in Artistic Style.
+     *
+     * @param textIn  A string containing the source code to be formatted.
+     * @param options A string of options to Artistic Style.
+     * @return A String containing the formatted source from Artistic Style,
+     * or an empty string on error.
+     */
+    public String formatSource(String textIn, String options) {   // Return the allocated string
+        // Memory space is allocated by OnAStyleMemAlloc, a callback function from AStyle
+        String textOut = "";
+        try {
+            textOut = AStyleMain(textIn, options);
+        } catch (UnsatisfiedLinkError e) {   //~ System.out.println(e.getMessage());
+            error("Cannot call the Java AStyleMain function");
+        }
+        return textOut;
+    }
+
+    /**
+     * Call the AStyleGetVersion function in Artistic Style.
+     *
+     * @return A String containing the version number from Artistic Style.
+     */
+    public String getVersion() {
+        String version = new String();
+        try {
+            version = AStyleGetVersion();
+        } catch (UnsatisfiedLinkError e) {   //~ System.out.println(e.getMessage());
+            error("Cannot call the Java AStyleGetVersion function");
+        }
+        return version;
+    }
+
 }