Disabling error checking and fixes, adding SQL reserved words

Author: pdet

build.gradle

@@ -24,4 +24,6 @@ patchPluginXml {
       <em>most HTML tags may be used</em>"""
 }
 
+
+
 sourceSets.main.java.srcDirs 'src/main/gen'

src/main/java/org/intellij/sdk/language/SQLTest.bnf

@@ -16,40 +16,56 @@
   parserUtilClass="org.intellij.sdk.language.SQLTestParserUtil"
 
   tokens=[
-  WHITE_SPACE='regexp:\n'
     SEMI=';'
     EQ='='
     LP='('
     RP=')'
     space=' '
-    tab = '\t'
-    tempdb='kkk'
-
+    dot = '.'
+    minus = '-'
+    plus = '+'
+    comma = ','
+    star = '*'
+    less = '<'
+    higher = '>'
     loop = 'loop'
     endloop = 'endloop'
     statement = 'statement'
     comment='regexp:#.*'
     number='regexp:\d+(\.\d*)?'
     id='regexp::?\p{Alpha}\w*:?'
     string="regexp:('([^'\\]|\\.)*'|\"([^\"\\]|\\.)*\")"
-    query_regex = "regexp:.*\;"
     query = 'query'
-    query_return_type = "regexp:[TIR]*\s"
-    query_label = "regexp:label.*\s"
+    query_return_type = "regexp:[TIR]+\s"
+    query_label = "regexp:label.+\s"
     load = 'load'
+    pragma = 'PRAGMA'
+    restart = 'restart'
+    begin = 'begin'
+    transaction = 'transaction'
+    rollback = 'rollback'
+    q_result = '----'
+
+
+    // SQL Keywords
+    sql = "regexp:(ADD|ALTER|AND|ANY|AS|ASC|BACKUP|BETWEEN|CASE|CHECK|CREATE|REPLACE|DELETE|DESC|COLUMN|CONSTRAINT|DROP|DATABASE|DEFAULT|EXEC|EXISTS|FOREIGN|FROM|FULL|GROUP|HAVING|IN|INDEX|INNER|INSERT|IS|LEFT|LIKE|LIMIT|NOT|OR|ORDER|BY|OUTER|PRIMARY|KEY|PROCEDURE|RIGHT|JOIN|ROWNUM|SELECT|DISTINCT|INTO|SET|TOP|TRUNCATE|TABLE|UNION|ALL|UNIQUE|UPDATE|VALUES|VIEW|WHERE)+\s"
   ]
 }
 
 testFile ::= item_ *
+external accept_all_rule ::= accept_all
+private item_ ::= !<<eof>> accept_all_rule
 
-private item_ ::= !<<eof>> (comment| property_loop|query_statement|load_statement) item_?
-
-property_loop ::= loop space id space number space number  property_statement endloop
-external tsv_line_rule ::= sqlResults
-external sql_query_rule ::= sqlQuery
-statement_value ::='ok'|'error'
-query_sort_mode ::= 'nosort'|'rowsort'|'valuesort'
-query_statement ::= query space query_return_type [(query_sort_mode [space query_label])|query_label] sql_query_rule '____' tsv_line_rule
-property_statement ::= STATEMENT space statement_value  query_regex
-load_statement ::= load space id
+//
+//private item_ ::= !<<eof>> (comment| property_loop|query_statement|load_statement|restart|property_statement) item_?
+//
+//property_loop ::= loop space id space number space number  property_statement endloop
+//external tsv_line_rule ::= sqlResults
+//external sql_query_rule ::= sqlQuery
+//statement_value ::='ok'|'error'
+//query_sort_mode ::= 'nosort'|'rowsort'|'valuesort'
+//pragma_rule ::= pragma space id
+//query_statement ::= query space query_return_type [(query_sort_mode [space query_label])|query_label] query_regex '----' tsv_line_rule
+//property_statement ::= STATEMENT space statement_value  (pragma_rule|query_regex)
+//load_statement ::= load space id
 

src/main/java/org/intellij/sdk/language/SQLTestParserDefinition.java

@@ -77,7 +77,7 @@ public SpaceRequirements spaceExistenceTypeBetweenTokens(ASTNode left, ASTNode r
     @NotNull
     @Override
     public PsiElement createElement(ASTNode node) {
-        return TestTypes.Factory.createElement(node);
+        return null;
     }
 
 }

src/main/java/org/intellij/sdk/language/SQLTestParserUtil.java

@@ -28,22 +28,29 @@ public void getLanguagesToInject(@NotNull final PsiLanguageInjectionHost host, @
             }
         }
     }
+
     public static boolean sqlResults(PsiBuilder builder, int level) {
-        boolean skip = false;
+        String text = builder.getTokenText();
+        IElementType cur = builder.getTokenType();
         IElementType x = builder.lookAhead(1);
         IElementType ID = new TestTokenType("id");
         IElementType NUMBER = new TestTokenType("number");
         IElementType EMPTY = new TestTokenType(" ");
-
-        while (true){
-            assert x != null;
-            if (!(x.toString().equals(ID.toString())  || x.toString().equals(NUMBER.toString())  || x.toString().equals(EMPTY.toString()))) break;
-            builder.advanceLexer();
-            x = builder.lookAhead(1);
-            skip = true;
+        if (cur != null){
+            while (cur.toString().equals(ID.toString()) || cur.toString().equals(NUMBER.toString()) || cur.toString().equals(EMPTY.toString())){
+                builder.advanceLexer();
+                cur = builder.getTokenType();
+                text = builder.getTokenText();
+            }
         }
-        if (skip){
+        return true;
+    }
+
+    public static boolean accept_all(PsiBuilder builder, int level) {
+        IElementType cur = builder.getTokenType();
+        if (cur != null){
             builder.advanceLexer();
+            cur = builder.getTokenType();
         }
         return true;
     }

src/main/java/org/intellij/sdk/language/SQLTestSyntaxHighlighter.java

@@ -27,6 +27,8 @@ public class SQLTestSyntaxHighlighter extends SyntaxHighlighterBase {
             createTextAttributesKey("TEST_BAD_CHARACTER", HighlighterColors.BAD_CHARACTER);
     public static final TextAttributesKey QUERY =
             createTextAttributesKey("TEST_Query", HighlighterColors.TEXT);
+    public static final TextAttributesKey SQL =
+            createTextAttributesKey("TEST_SQL",  DefaultLanguageHighlighterColors.CONSTANT);
 
     private static final TextAttributesKey[] BAD_CHAR_KEYS = new TextAttributesKey[]{BAD_CHARACTER};
     private static final TextAttributesKey[] RESERVED_KEYS = new TextAttributesKey[]{RESERVED};
@@ -35,6 +37,7 @@ public class SQLTestSyntaxHighlighter extends SyntaxHighlighterBase {
 
     private static final TextAttributesKey[] VALUE_KEYS = new TextAttributesKey[]{VALUE};
     private static final TextAttributesKey[] COMMENT_KEYS = new TextAttributesKey[]{COMMENT};
+    private static final TextAttributesKey[] SQL_KEYS = new TextAttributesKey[]{SQL};
     private static final TextAttributesKey[] EMPTY_KEYS = new TextAttributesKey[0];
 
     @NotNull
@@ -46,18 +49,18 @@ public Lexer getHighlightingLexer() {
     @NotNull
     @Override
     public TextAttributesKey[] getTokenHighlights(IElementType tokenType) {
-        if (tokenType.equals(TestTypes.LOOP) || tokenType.equals(TestTypes.LOAD) || tokenType.equals(TestTypes.ENDLOOP)|| tokenType.equals(TestTypes.STATEMENT) || tokenType.equals(TestTypes.QUERY)) {
+        if (tokenType.equals(TestTypes.LOOP) || tokenType.equals(TestTypes.Q_RESULT) || tokenType.equals(TestTypes.RESTART)|| tokenType.equals(TestTypes.BEGIN)|| tokenType.equals(TestTypes.TRANSACTION) || tokenType.equals(TestTypes.ROLLBACK)||tokenType.equals(TestTypes.PRAGMA) ||tokenType.equals(TestTypes.RESTART) || tokenType.equals(TestTypes.LOAD) || tokenType.equals(TestTypes.ENDLOOP)|| tokenType.equals(TestTypes.STATEMENT) || tokenType.equals(TestTypes.QUERY)) {
             return RESERVED_KEYS;
         } else if (tokenType.equals(TestTypes.ID)|| tokenType.equals(TestTypes.QUERY_RETURN_TYPE)) {
             return KEY_KEYS;
-        } else if (tokenType.equals(TestTypes.NUMBER) || tokenType.equals(TestTypes.STATEMENT_VALUE) || tokenType.equals(TestTypes.QUERY_SORT_MODE) || tokenType.equals(TestTypes.QUERY_LABEL)) {
+        } else if (tokenType.equals(TestTypes.NUMBER) || tokenType.equals(TestTypes.QUERY_LABEL)) {
             return VALUE_KEYS;
         } else if (tokenType.equals(TestTypes.COMMENT)) {
             return COMMENT_KEYS;
         } else if (tokenType.equals(TokenType.BAD_CHARACTER)) {
             return BAD_CHAR_KEYS;
-        } else if (tokenType.equals(TestTypes.QUERY_REGEX)){
-            return QUERY_KEYS;
+        } else if (tokenType.equals(TestTypes.SQL)){
+            return SQL_KEYS;
         } else {
             return EMPTY_KEYS;
         }