Merge pull request #3 from clatisus/junjie--support-airbnb-type

feat. support Airbnb type & annotation
clatisus · Dec 16, 2021 · 7da4937 · 7da4937
2 parents a3453eb + abaef07
commit 7da4937
Show file tree

Hide file tree

Showing 10 changed files with 95 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@
 
 .gradle
 build
+bin
diff --git a/thrift/src/main/gen/com/intellij/plugins/thrift/lang/lexer/ThriftTokenTypes.java b/thrift/src/main/gen/com/intellij/plugins/thrift/lang/lexer/ThriftTokenTypes.java
diff --git a/thrift/src/main/gen/com/intellij/plugins/thrift/lang/parser/ThriftParser.java b/thrift/src/main/gen/com/intellij/plugins/thrift/lang/parser/ThriftParser.java
diff --git a/thrift/src/main/gen/com/intellij/plugins/thrift/lang/psi/ThriftSimpleAirbnbType.java b/thrift/src/main/gen/com/intellij/plugins/thrift/lang/psi/ThriftSimpleAirbnbType.java
diff --git a/thrift/src/main/gen/com/intellij/plugins/thrift/lang/psi/ThriftSimpleBaseType.java b/thrift/src/main/gen/com/intellij/plugins/thrift/lang/psi/ThriftSimpleBaseType.java
diff --git a/thrift/src/main/gen/com/intellij/plugins/thrift/lang/psi/ThriftVisitor.java b/thrift/src/main/gen/com/intellij/plugins/thrift/lang/psi/ThriftVisitor.java
diff --git a/...ft/src/main/gen/com/intellij/plugins/thrift/lang/psi/impl/ThriftSimpleAirbnbTypeImpl.java b/...ft/src/main/gen/com/intellij/plugins/thrift/lang/psi/impl/ThriftSimpleAirbnbTypeImpl.java
diff --git a/thrift/src/main/gen/com/intellij/plugins/thrift/lang/psi/impl/ThriftSimpleBaseTypeImpl.java b/thrift/src/main/gen/com/intellij/plugins/thrift/lang/psi/impl/ThriftSimpleBaseTypeImpl.java
diff --git a/thrift/src/main/grammar/Thrift.bnf b/thrift/src/main/grammar/Thrift.bnf
@@ -138,7 +138,8 @@ Throws          ::=  'throws' '(' fieldsWithBraceRecovery ')' {pin=1}
 
 FieldType       ::=  BaseType | ContainerType | CustomType
 BaseType        ::=  SimpleBaseType TypeAnnotations?
-SimpleBaseType  ::=  'bool' | 'byte' | 'i8' | 'i16' | 'i32' | 'i64' | 'double' | 'string' | 'binary' | 'slist'
+SimpleBaseType  ::=  'bool' | 'byte' | 'i8' | 'i16' | 'i32' | 'i64' | 'double' | 'string' | 'binary' | 'slist' | SimpleAirbnbType
+SimpleAirbnbType::=  'date_time' | 'date' | 'json_object' | 'id'
 ContainerType   ::=  SimpleContainerType TypeAnnotations?
 private SimpleContainerType   ::=  MapType | SetType | ListType
 MapType         ::=  'map' CppType? GenericType {pin=1}
@@ -163,6 +164,6 @@ ListSeparator   ::=  ',' | ';'
 
 TypeAnnotations ::= '(' TypeAnnotationList ')'
 TypeAnnotationList ::= TypeAnnotation* {recoverWhile=braceRecovery}
-TypeAnnotation ::= Identifier ('=' Literal ListSeparator?)?
+TypeAnnotation ::= Identifier ('=' Literal)? ListSeparator?
 
 private braceRecovery ::= !(')')
diff --git a/thrift/src/main/java/com/intellij/plugins/thrift/util/ThriftUtils.java b/thrift/src/main/java/com/intellij/plugins/thrift/util/ThriftUtils.java
@@ -3,6 +3,8 @@
 import com.intellij.util.containers.ContainerUtil;
 
 import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * Created by fkorotkov.
@@ -20,7 +22,14 @@ public class ThriftUtils {
           "javame", "json", "netstd", "nodejs", "nodets", "ocaml", "swift", "ts", "xml"
   );
 
-  public static Set<String> getKeywords() {
-    return keywords;
-  }
+    private static final Set<String> keywordsWithAirbnb =
+            Stream.concat(
+                    keywords.stream(),
+                    ContainerUtil.immutableSet(
+                            "date_time", "date", "json_object", "id").stream()
+            ).collect(Collectors.toSet());
+
+    public static Set<String> getKeywords() {
+       return keywordsWithAirbnb;
+    }
 }