[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/csharp-mode 166a5fb 340/459: Revert "Handle "nameof" en
From: |
ELPA Syncer |
Subject: |
[elpa] externals/csharp-mode 166a5fb 340/459: Revert "Handle "nameof" entirely in c-basic-matchers-after." |
Date: |
Sun, 22 Aug 2021 13:59:57 -0400 (EDT) |
branch: externals/csharp-mode
commit 166a5fb4a90a9e227ab486980b1d8b1090f65d01
Author: Theodor Thornhill <theodor.thornhill@frende.no>
Commit: Theodor Thornhill <theodor.thornhill@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))
- [elpa] externals/csharp-mode cb2404f 434/459: Correctly handle implicit types in for_each_statement, (continued)
- [elpa] externals/csharp-mode cb2404f 434/459: Correctly handle implicit types in for_each_statement, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 09b4d57 437/459: Add comment-start-skip, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 254b91b 439/459: Fix parse and sigabort errors on latest tree-sitter, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 76428ef 444/459: Nested type params and using declaration fixes (#233), ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 6988939 448/459: Tweak mode to not require tree-sitter packages, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 33e3042 446/459: Change ci setup to purcell/nix-emacs-ci (#236), ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 093f0f2 447/459: Add static as keyword in csharp-tree-sitter, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 96563d1 451/459: Add back in wrongly removed backtick, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 5f127e2 455/459: Add small notice about elpa in readme, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 2595b90 449/459: Revert "Tweak mode to not require tree-sitter packages", ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 166a5fb 340/459: Revert "Handle "nameof" entirely in c-basic-matchers-after.",
ELPA Syncer <=
- [elpa] externals/csharp-mode 1e7bf8a 358/459: Update build.yml, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode a685c7f 359/459: Update build.yml, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode e2541a4 362/459: Update README.org, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode c1489db 370/459: First small tree-sitter query, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 2bf76fd 378/459: Fix csharp-mode initialization without forked tree-sitter, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 7e7353a 133/459: Imenu fixes: methods with comments, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 1de5644 227/459: using: Don't mess up alnums in indentifier-fontification., ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 8d43a70 229/459: Fix fontification of using-statements., ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 4da4c39 231/459: Fix fontification of namespaces to match using-statement rules., ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 5e47b77 260/459: Fix error handling multiline compiler-directives., ELPA Syncer, 2021/08/22