Merge pull request #133 from ridiculouswaffle/add-function-call-highlight

Add function call highlighting to dart-mode

Author: jcs090218

dart-mode.el

@@ -155,7 +155,6 @@ indentation levels from right to left."
     "Function"
     "get"
     "implements"
-    "import"
     "interface"
     "late"
     "library"
@@ -196,6 +195,7 @@ indentation levels from right to left."
     "this"
     "throw"
     "try"
+    "import"
     "var"
     "while"
     "with"))
@@ -362,6 +362,29 @@ For example, \"main\" in \"void main() async\" would be matched."
         (goto-char end))
       (throw 'result nil))))
 
+(defun dart--function-call-func (limit)
+  "Font-lock matcher function for method invocations.
+
+Matches invocations before LIMIT that look like,
+
+  \"lowercaseIdentifier([...])\"
+
+For example, the \"now\" in \"DateTime.now()\" would be matched"
+  (catch 'result
+    (let (beg end)
+      (while (re-search-forward
+	      (rx (group (eval (dart--identifier 'lower))) ?\() limit t)
+	(setq beg (match-beginning 1))
+	(setq end (match-end 1))
+	;; Exclude control-flow expressions to highlight only methods
+	(unless (member (match-string 1)
+			'("if" "switch" "for" "while" "catch" "assert"))
+	  (set-match-data (list beg end))
+	  (goto-char end)
+	  (throw 'result t))
+	(goto-char end)))
+    (throw 'result nil)))
+
 (defun dart--abstract-method-func (limit)
   "Font-lock matcher function for abstract methods.
 
@@ -614,6 +637,7 @@ untyped parameters. For example, in
     (,(regexp-opt dart--types 'words)     . font-lock-type-face)
     (,dart--types-re                      . font-lock-type-face)
     (dart--function-declaration-func      . font-lock-function-name-face)
+    (dart--function-call-func             . font-lock-function-name-face)
     (,dart--operator-declaration-re       . (1 font-lock-function-name-face))
     (dart--abstract-method-func           . font-lock-function-name-face)))