fix: C++ comments after #include

Fixes #841
alecthomas · Sep 9, 2023 · c4527e8 · c4527e8
1 parent 40542a6
commit c4527e8
Show file tree

Hide file tree

Showing 7 changed files with 426 additions and 421 deletions.
diff --git a/Makefile b/Makefile
@@ -13,11 +13,11 @@ tokentype_string.go: types.go
 	go generate
 
 chromad:
-	rm -f chromad
+	rm -rf build
 	esbuild --bundle cmd/chromad/static/index.js --minify --outfile=cmd/chromad/static/index.min.js
 	esbuild --bundle cmd/chromad/static/index.css --minify --outfile=cmd/chromad/static/index.min.css
-	(export CGOENABLED=0 ; cd ./cmd/chromad && go build -ldflags="-X 'main.version=$(VERSION)'" -o ../../chromad .)
+	(export CGOENABLED=0 ; cd ./cmd/chromad && go build -ldflags="-X 'main.version=$(VERSION)'" -o ../../build/chromad .)
 
-upload: chromad
-	scp chromad root@swapoff.org: && \
+upload: build/chromad
+	scp build/chromad root@swapoff.org: && \
 		ssh root@swapoff.org 'install -m755 ./chromad /srv/http/swapoff.org/bin && service chromad restart'
diff --git a/bin/.svu-1.11.0.pkg b/bin/.svu-1.11.0.pkg
@@ -0,0 +1 @@
+hermit
diff --git a/bin/svu b/bin/svu
@@ -0,0 +1 @@
+.svu-1.11.0.pkg
diff --git a/lexers/embedded/c++.xml b/lexers/embedded/c++.xml
@@ -84,7 +84,7 @@
       </rule>
     </state>
     <state name="macro">
-      <rule pattern="(include)(\s*(?:/[*].*?[*]/\s*)?)([^\n]+)">
+      <rule pattern="(include)(\s+)(&quot;[^&quot;]+?&quot;|&lt;[^&gt;]+?&gt;)">
         <bygroups>
           <token type="CommentPreproc"/>
           <token type="Text"/>

diff --git a/lexers/testdata/cpp.actual b/lexers/testdata/cpp.actual
@@ -1,5 +1,5 @@
-#include "a"
-#include <b>
+#include "a" // comment
+#include <b> // comment
 
 [[nodiscard]] void foo() noexcept;
 void foo();

diff --git a/lexers/testdata/cpp.expected b/lexers/testdata/cpp.expected
@@ -2,10 +2,13 @@
   {"type":"CommentPreproc","value":"#include"},
   {"type":"Text","value":" "},
   {"type":"CommentPreprocFile","value":"\"a\""},
-  {"type":"CommentPreproc","value":"\n#include"},
+  {"type":"CommentPreproc","value":" "},
+  {"type":"CommentSingle","value":"// comment\n"},
+  {"type":"CommentPreproc","value":"#include"},
   {"type":"Text","value":" "},
   {"type":"CommentPreprocFile","value":"\u003cb\u003e"},
-  {"type":"CommentPreproc","value":"\n"},
+  {"type":"CommentPreproc","value":" "},
+  {"type":"CommentSingle","value":"// comment\n"},
   {"type":"Text","value":"\n"},
   {"type":"NameAttribute","value":"[[nodiscard]]"},
   {"type":"Text","value":" "},