Improve error messages and generate operator<< for records

CONTRIBUTORS

@@ -5,4 +5,5 @@ The complete list of contributors can be identified through
 Git history.
 
 - Google Inc.
+- Microsoft Corp.
 

README.md

@@ -507,6 +507,14 @@ For more informations, take a look at https://github.com/leetal/ios-cmake.
 
 - `ENABLE_BITCODE`: enable/disable the bitcode generation.
 
+## Android Parcelable records
+
+Djinni supports generating records that implements `android.os.parcelable`.
+
+In order to do that, there are two steps needed:
+- deriving the records that should be parcelable with the keyword parcelable: `deriving(parcelable)`
+- run Djinni with the following flag `--java-implement-android-os-parcelable true`
+
 ## Community Links
 
 * Join the discussion with other developers at the [Mobile C++ Slack Community](https://mobilecpp.herokuapp.com/)

example/android/app/build.gradle

@@ -10,6 +10,12 @@ android {
         versionCode 1
         versionName "1.0"
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
     buildTypes {
         release {
             minifyEnabled false

example/generated-src/cpp/sort_order.hpp

@@ -4,6 +4,7 @@
 #pragma once
 
 #include <functional>
+#include <ostream>
 
 namespace textsort {
 
@@ -13,6 +14,16 @@ enum class sort_order : int {
     RANDOM,
 };
 
+static inline ::std::ostream& operator<<(::std::ostream& os, sort_order v) {
+    os << "sort_order::";
+    switch (v) {
+        case sort_order::ASCENDING: return os << "ASCENDING";
+        case sort_order::DESCENDING: return os << "DESCENDING";
+        case sort_order::RANDOM: return os << "RANDOM";
+        default: return os << "<Unsupported Value " << static_cast<int>(v) << ">";
+    }
+}
+
 }  // namespace textsort
 
 namespace std {

example/generated-src/java/com/dropbox/textsort/SortItems.java

@@ -7,18 +7,24 @@
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 
-/*package*/ abstract class SortItems {
+/*package*/ interface SortItems {
     /** For the iOS / Android demo */
-    public abstract void sort(@Nonnull SortOrder order, @Nonnull ItemList items);
+    public void sort(@Nonnull SortOrder order, @Nonnull ItemList items);
 
     @CheckForNull
-    public static native SortItems createWithListener(@CheckForNull TextboxListener listener);
+    public static SortItems createWithListener(@CheckForNull TextboxListener listener)
+    {
+        return CppProxy.createWithListener(listener);
+    }
 
     /** For the localhost / command-line demo */
     @Nonnull
-    public static native ItemList runSort(@Nonnull ItemList items);
+    public static ItemList runSort(@Nonnull ItemList items)
+    {
+        return CppProxy.runSort(items);
+    }
 
-    private static final class CppProxy extends SortItems
+    static final class CppProxy implements SortItems
     {
         private final long nativeRef;
         private final AtomicBoolean destroyed = new AtomicBoolean(false);
@@ -30,14 +36,14 @@ private CppProxy(long nativeRef)
         }
 
         private native void nativeDestroy(long nativeRef);
-        public void destroy()
+        public void _djinni_private_destroy()
         {
             boolean destroyed = this.destroyed.getAndSet(true);
             if (!destroyed) nativeDestroy(this.nativeRef);
         }
         protected void finalize() throws java.lang.Throwable
         {
-            destroy();
+            _djinni_private_destroy();
             super.finalize();
         }
 
@@ -48,5 +54,11 @@ public void sort(SortOrder order, ItemList items)
             native_sort(this.nativeRef, order, items);
         }
         private native void native_sort(long _nativeRef, SortOrder order, ItemList items);
+
+        @CheckForNull
+        public static native SortItems createWithListener(@CheckForNull TextboxListener listener);
+
+        @Nonnull
+        public static native ItemList runSort(@Nonnull ItemList items);
     }
 }

example/generated-src/java/com/dropbox/textsort/TextboxListener.java

@@ -6,6 +6,6 @@
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 
-/*package*/ abstract class TextboxListener {
-    public abstract void update(@Nonnull ItemList items);
+/*package*/ interface TextboxListener {
+    public void update(@Nonnull ItemList items);
 }

example/generated-src/jni/NativeSortItems.cpp

@@ -31,7 +31,7 @@ CJNIEXPORT void JNICALL Java_com_dropbox_textsort_SortItems_00024CppProxy_native
     } JNI_TRANSLATE_EXCEPTIONS_RETURN(jniEnv, )
 }
 
-CJNIEXPORT jobject JNICALL Java_com_dropbox_textsort_SortItems_createWithListener(JNIEnv* jniEnv, jobject /*this*/, jobject j_listener)
+CJNIEXPORT jobject JNICALL Java_com_dropbox_textsort_SortItems_00024CppProxy_createWithListener(JNIEnv* jniEnv, jobject /*this*/, jobject j_listener)
 {
     try {
         DJINNI_FUNCTION_PROLOGUE0(jniEnv);
@@ -40,7 +40,7 @@ CJNIEXPORT jobject JNICALL Java_com_dropbox_textsort_SortItems_createWithListene
     } JNI_TRANSLATE_EXCEPTIONS_RETURN(jniEnv, 0 /* value doesn't matter */)
 }
 
-CJNIEXPORT jobject JNICALL Java_com_dropbox_textsort_SortItems_runSort(JNIEnv* jniEnv, jobject /*this*/, jobject j_items)
+CJNIEXPORT jobject JNICALL Java_com_dropbox_textsort_SortItems_00024CppProxy_runSort(JNIEnv* jniEnv, jobject /*this*/, jobject j_items)
 {
     try {
         DJINNI_FUNCTION_PROLOGUE0(jniEnv);

example/generated-src/objc/TextSort-Bridging-Header.h

@@ -1,6 +1,17 @@
 // AUTOGENERATED FILE - DO NOT MODIFY!
 // This file generated by Djinni
 
+// TextSort_Bridging_Header.h
+// TextSort_Bridging_Header
+
+#import <Foundation/Foundation.h>
+
+//! Project version number for TextSortBridgingHeader.
+FOUNDATION_EXPORT double TextSortBridgingHeaderVersionNumber;
+
+//! Project version string for TextSortBridgingHeader.
+FOUNDATION_EXPORT const unsigned char TextSortBridgingHeaderVersionString[];
+
 #import "TXSItemList.h"
 #import "TXSSortOrder.h"
 #import "TXSSortItems.h"

example/handwritten-src/java/com/dropbox/textsort/TextboxListenerImpl.java

@@ -4,7 +4,7 @@
 
 import java.util.ArrayList;
 
-public class TextboxListenerImpl extends TextboxListener {
+public class TextboxListenerImpl implements TextboxListener {
 
     private EditText mTextArea;
 

example/run_djinni.sh

@@ -54,6 +54,7 @@ fi
     --java-out "$temp_out/java" \
     --java-package $java_package \
     --java-class-access-modifier "package" \
+    --java-generate-interfaces true \
     --java-nullable-annotation "javax.annotation.CheckForNull" \
     --java-nonnull-annotation "javax.annotation.Nonnull" \
     --ident-java-field mFooBar \

intellij-plugin/.gitignore

@@ -0,0 +1,3 @@
+out/
+*~
+resources/META-INF

intellij-plugin/META-INF/plugin.xml

@@ -13,10 +13,10 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<idea-plugin version="2">
+<idea-plugin>
   <id>com.dropbox.djinni.ideaplugin</id>
   <name>Djinni IDL file support</name>
-  <version>0.8</version>
+  <version>0.8.1</version>
   <vendor url="https://github.com/dropbox/djinni">Dropbox Djinni Github Project</vendor>
 
   <description><![CDATA[
@@ -70,6 +70,7 @@
     <lang.psiStructureViewFactory language="Djinni" implementationClass="com.dropbox.djinni.ideaplugin.DjinniStructureViewFactory"/>
     <lang.formatter language="Djinni" implementationClass="com.dropbox.djinni.ideaplugin.DjinniFormattingModelBuilder"/>
     <lang.commenter language="Djinni" implementationClass="com.dropbox.djinni.ideaplugin.DjinniCommenter"/>
+    <lang.braceMatcher language="Djinni" implementationClass="com.dropbox.djinni.ideaplugin.DjinniBraceMatcher"/>
   </extensions>
 
   <application-components>