Merge pull request #2860 from larshp/master

ABAP: add keywords RETURN, ASCENDING, DESCENDING
ajaxorg · Jan 23, 2016 · e857624 · e857624
2 parents dbdf8aa + 67ab533
commit e857624
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 4 deletions.
diff --git a/demo/kitchen-sink/docs/abap.abap b/demo/kitchen-sink/docs/abap.abap
@@ -33,4 +33,9 @@ DATA LAST_EOM    TYPE D.  "last end-of-month date
 DATA : BEGIN OF I_VBRK OCCURS 0,
          VBELN LIKE VBRK-VBELN,
          ZUONR LIKE VBRK-ZUONR,
-       END OF I_VBRK.
+       END OF I_VBRK.
+
+SORT i_vbrk BY vbeln ASCENDING.
+SORT i_vbrk BY vbeln DESCENDING.
+
+RETURN.
diff --git a/lib/ace/mode/_test/tokens_abap.json b/lib/ace/mode/_test/tokens_abap.json
@@ -186,4 +186,28 @@
   ["keyword","END OF"],
   ["text"," I_VBRK"],
   ["keyword.operator","."]
+],[
+   "start"
+],[
+   "start",
+  ["keyword","SORT"],
+  ["text"," i_vbrk "],
+  ["keyword","BY"],
+  ["text"," vbeln "],
+  ["keyword","ASCENDING"],
+  ["keyword.operator","."]
+],[
+   "start",
+  ["keyword","SORT"],
+  ["text"," i_vbrk "],
+  ["keyword","BY"],
+  ["text"," vbeln "],
+  ["keyword","DESCENDING"],
+  ["keyword.operator","."]
+],[
+   "start"
+],[
+   "start",
+  ["keyword","RETURN"],
+  ["keyword.operator","."]
 ]]
diff --git a/lib/ace/mode/abap_highlight_rules.js b/lib/ace/mode/abap_highlight_rules.js
@@ -48,9 +48,9 @@ var AbapHighlightRules = function() {
     var keywordMapper = this.createKeywordMapper({
         "variable.language": "this",
         "keyword": 
-            "ADD ALIAS ALIASES ASSERT ASSIGN ASSIGNING AT BACK" +
+            "ADD ALIAS ALIASES ASCENDING ASSERT ASSIGN ASSIGNING AT BACK" +
             " CALL CASE CATCH CHECK CLASS CLEAR CLOSE CNT COLLECT COMMIT COMMUNICATION COMPUTE CONCATENATE CONDENSE CONSTANTS CONTINUE CONTROLS CONVERT CREATE CURRENCY" +
-            " DATA DEFINE DEFINITION DEFERRED DELETE DESCRIBE DETAIL DIVIDE DO" +
+            " DATA DEFINE DEFINITION DEFERRED DELETE DESCENDING DESCRIBE DETAIL DIVIDE DO" +
             " ELSE ELSEIF ENDAT ENDCASE ENDCLASS ENDDO ENDEXEC ENDFORM ENDFUNCTION ENDIF ENDIFEND ENDINTERFACE ENDLOOP ENDMETHOD ENDMODULE ENDON ENDPROVIDE ENDSELECT ENDTRY ENDWHILE EVENT EVENTS EXEC EXIT EXPORT EXPORTING EXTRACT" +
             " FETCH FIELDS FORM FORMAT FREE FROM FUNCTION" +
             " GENERATE GET" +
@@ -60,7 +60,7 @@ var AbapHighlightRules = function() {
             " MESSAGE METHOD METHODS MODIFY MODULE MOVE MULTIPLY" +
             " ON OVERLAY OPTIONAL OTHERS" +
             " PACK PARAMETERS PERFORM POSITION PROGRAM PROVIDE PUT" +
-            " RAISE RANGES READ RECEIVE RECEIVING REDEFINITION REFERENCE REFRESH REJECT REPLACE REPORT RESERVE RESTORE RETURNING ROLLBACK" +
+            " RAISE RANGES READ RECEIVE RECEIVING REDEFINITION REFERENCE REFRESH REJECT REPLACE REPORT RESERVE RESTORE RETURN RETURNING ROLLBACK" +
             " SCAN SCROLL SEARCH SELECT SET SHIFT SKIP SORT SORTED SPLIT STANDARD STATICS STEP STOP SUBMIT SUBTRACT SUM SUMMARY SUPPRESS" +
             " TABLES TIMES TRANSFER TRANSLATE TRY TYPE TYPES" +
             " UNASSIGN ULINE UNPACK UPDATE" +