Merge pull request #102 from mega-dean/highlight-namespaced-types

add `.` to `zig-re-identifier` to highlight namespaced types
ziglang · Mar 25, 2024 · 5be43db · 5be43db
2 parents b6f5375 + 1870363
commit 5be43db
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/run_tests.sh b/run_tests.sh
@@ -19,4 +19,4 @@ INIT_PACKAGES="(progn \
       (package-install pkg))) \
   )"
 
-"${EMACS}" --eval "${INIT_PACKAGES}" --batch -l zig-mode.el -l tests.el -f ert-run-tests-batch-and-exit
+"${EMACS}" --eval "${INIT_PACKAGES}" --batch -l zig-mode.el -l test/zig-tests.el -f ert-run-tests-batch-and-exit
diff --git a/test/zig-tests.el b/test/zig-tests.el
@@ -118,6 +118,26 @@ const python =
      ("void" font-lock-type-face)
      )))
 
+(ert-deftest test-font-lock-parameters-with-periods ()
+  (zig-test-font-lock
+   "fn doSomething(arg: thing.with.periods) void {}"
+   '(("fn" font-lock-keyword-face)
+     ("doSomething" font-lock-function-name-face)
+     ("arg" font-lock-variable-name-face)
+     ("thing.with.periods" font-lock-type-face)
+     ("void" font-lock-type-face)
+     )))
+
+(ert-deftest test-font-lock-struct-type-with-periods ()
+  (zig-test-font-lock
+   "const S = struct { field: thing.with.periods }; "
+   '(("const" font-lock-keyword-face)
+     ("S" font-lock-variable-name-face)
+     ("struct" font-lock-keyword-face)
+     ("field" font-lock-variable-name-face)
+     ("thing.with.periods" font-lock-type-face)
+     )))
+
 ;; Test all permutations of '?', '*', '[]', '* const', and '[] const' for 3 of those in a row
 ;; For example, ??[]Bar or [][]const *Bar
 (ert-deftest test-font-lock-parameters-optionals-pointers-and-arrays ()

diff --git a/zig-mode.el b/zig-mode.el
@@ -134,11 +134,12 @@ If given a SOURCE, execute the CMD on it."
   (concat "\\(?:" zig-re-optional "\\|" zig-re-pointer "\\|" zig-re-array "\\)*"))
 
 (defconst zig-re-identifier "[[:word:]_][[:word:]_[:digit:]]*")
+(defconst zig-re-type "[[:word:]_.][[:word:]_.[:digit:]]*")
 (defconst zig-re-type-annotation
   (concat (zig-re-grab zig-re-identifier)
           "[[:space:]]*:[[:space:]]*"
           zig-re-optionals-pointers-arrays
-          (zig-re-grab zig-re-identifier)))
+          (zig-re-grab zig-re-type)))
 
 (defun zig-re-definition (dtype)
   "Construct a regular expression for definitions of type DTYPE."