[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/csharp-mode fc6f94f 339/459: Handle "nameof" entirely i
From: |
ELPA Syncer |
Subject: |
[elpa] externals/csharp-mode fc6f94f 339/459: Handle "nameof" entirely in c-basic-matchers-after. |
Date: |
Sun, 22 Aug 2021 13:59:56 -0400 (EDT) |
branch: externals/csharp-mode
commit fc6f94f9e92e8e8342e7e5297f721456bb8bf7dc
Author: Jostein Kjønigsen <jostein@kjonigsen.net>
Commit: Jostein Kjønigsen <jostein@kjonigsen.net>
Handle "nameof" entirely in c-basic-matchers-after.
- both "keyword" and variable.
This closes https://github.com/josteink/csharp-mode/issues/190.
---
csharp-mode.el | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/csharp-mode.el b/csharp-mode.el
index 692db57..62a27fc 100644
--- a/csharp-mode.el
+++ b/csharp-mode.el
@@ -47,7 +47,15 @@
(defconst csharp--regex-type-name-matcher
(concat "\\(" csharp--regex-type-name "\\)")
- "Regex matching a type identifier in C#."))
+ "Regex matching a type identifier in C#.")
+
+ (defconst csharp--regex-identifier
+ "[A-Za-z][A-Za-z0-9_]*"
+ "Regex describing an dentifier in C#.")
+
+ (defconst csharp--regex-identifier-matcher
+ (concat "\\(" csharp--regex-identifier "\\)")
+ "Regex matching an identifier in C#."))
(eval-and-compile
(c-add-language 'csharp-mode 'java-mode))
@@ -155,7 +163,7 @@
(c-lang-defconst c-other-kwds
csharp '("select" "from" "where" "join" "in" "on" "equals" "into"
- "orderby" "ascending" "descending" "group" "nameof" "when"
+ "orderby" "ascending" "descending" "group" "when"
"let" "by"))
(c-lang-defconst c-colon-type-list-kwds
@@ -308,6 +316,12 @@
`((,(concat "^namespace\\s *" csharp--regex-type-name-matcher" \\s
*")
1 font-lock-variable-name-face t))
+ `((,(concat "\\(\\<nameof\\>\\) *(" )
+ 1 font-lock-function-name-face t))
+
+ `((,(concat "\\<nameof\\> *( *" csharp--regex-identifier-matcher "
*) *")
+ 1 font-lock-variable-name-face t))
+
;; function names
`(("\\([A-Za-z0-9_]+\\)\\(<[a-zA-Z0-9, ]+>\\)?("
1 font-lock-function-name-face t))
- [elpa] externals/csharp-mode 72c1912 314/459: Name change of codedoc functions, (continued)
- [elpa] externals/csharp-mode 72c1912 314/459: Name change of codedoc functions, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode ecc3f38 317/459: Add annotation-top-cont as a new syntax construct, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 51ab628 319/459: Update README.org, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode be5af57 322/459: Fix optional type suffix regex, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 217d3a7 324/459: Revert "Add nullable operator to concatenated identifiers", ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 97903a2 327/459: Merge pull request #179 from josteink/feature/compilation-mode-dotnetcore, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode c44989a 331/459: Merge pull request #183 from josteink/vscode-fontification, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 2697c95 332/459: Move bobp checking in one level, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode adc69a4 335/459: Merge pull request #187 from josteink/bugfix/185, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode fb1f7d5 338/459: Don't duplicate values and remove unneeded test, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode fc6f94f 339/459: Handle "nameof" entirely in c-basic-matchers-after.,
ELPA Syncer <=
- [elpa] externals/csharp-mode 77a7243 341/459: Finally adapt CC Mode namespace matcher function, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode eff5dec 345/459: Try improve compilation-mode support for dotnet test fails., ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 605b0e0 346/459: Add configuration option to font-locking of codedoc tags, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 49ca95e 350/459: RIP Marmalade, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 73c27c7 353/459: Update build.yml, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 6e7922d 354/459: Update build.yml, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode a99e43c 356/459: Update build.yml, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 9f36ad6 361/459: RIP Travis, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 48b11cf 366/459: Fix issues with non-nested using-statements., ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 064a3a3 368/459: Fix detection of xUnit test-failures in compilation-mode, ELPA Syncer, 2021/08/22