branch: externals/csharp-mode
commit 166a5fb4a90a9e227ab486980b1d8b1090f65d01
Author: Theodor Thornhill <theodor.thornh...@frende.no>
Commit: Theodor Thornhill <theodor.thornh...@frende.no>
Revert "Handle "nameof" entirely in c-basic-matchers-after."
This reverts commit fc6f94f9e92e8e8342e7e5297f721456bb8bf7dc.
This is to resolve conflicts easier with #188
---
csharp-mode.el | 18 ++----------------
1 file changed, 2 insertions(+), 16 deletions(-)
diff --git a/csharp-mode.el b/csharp-mode.el
index 62a27fc..692db57 100644
--- a/csharp-mode.el
+++ b/csharp-mode.el
@@ -47,15 +47,7 @@
(defconst csharp--regex-type-name-matcher
(concat "\\(" csharp--regex-type-name "\\)")
- "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#."))
+ "Regex matching a type identifier in C#."))
(eval-and-compile
(c-add-language 'csharp-mode 'java-mode))
@@ -163,7 +155,7 @@
(c-lang-defconst c-other-kwds
csharp '("select" "from" "where" "join" "in" "on" "equals" "into"
- "orderby" "ascending" "descending" "group" "when"
+ "orderby" "ascending" "descending" "group" "nameof" "when"
"let" "by"))
(c-lang-defconst c-colon-type-list-kwds
@@ -316,12 +308,6 @@
`((,(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))
