go/chroma
1
0
Fork 0
mirror of https://github.com/alecthomas/chroma.git synced 2025-07-13 01:10:14 +02:00
Code Issues Releases Activity

fix: C++ comments after #include

Browse Source 
Fixes #841
This commit is contained in:
Alec Thomas
2023-09-09 13:07:35 +10:00
parent 40542a6255
commit c4527e8d5c
7 changed files with 426 additions and 421 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -13,11 +13,11 @@ tokentype_string.go: types.go
go generate go generate
chromad: 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.js --minify --outfile=cmd/chromad/static/index.min.js
esbuild --bundle cmd/chromad/static/index.css --minify --outfile=cmd/chromad/static/index.min.css 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 upload: build/chromad
scp chromad root@swapoff.org: && \ scp build/chromad root@swapoff.org: && \
ssh root@swapoff.org 'install -m755 ./chromad /srv/http/swapoff.org/bin && service chromad restart' ssh root@swapoff.org 'install -m755 ./chromad /srv/http/swapoff.org/bin && service chromad restart'

1
bin/.svu-1.11.0.pkg Symbolic link
View File

@ -0,0 +1 @@
hermit

1
bin/svu Symbolic link
View File

@ -0,0 +1 @@
.svu-1.11.0.pkg

2
lexers/embedded/c++.xml
View File

@ -84,7 +84,7 @@
</rule> </rule>
</state> </state>
<state name="macro"> <state name="macro">
<rule pattern="(include)(\s*(?:/[*].*?[*]/\s*)?)([^\n]+)"> <rule pattern="(include)(\s+)(&quot;[^&quot;]+?&quot;|&lt;[^&gt;]+?&gt;)">
<bygroups> <bygroups>
<token type="CommentPreproc"/> <token type="CommentPreproc"/>
<token type="Text"/> <token type="Text"/>

4
lexers/testdata/cpp.actual vendored
View File

@ -1,5 +1,5 @@
#include "a" #include "a" // comment
#include <b> #include <b> // comment
[[nodiscard]] void foo() noexcept; [[nodiscard]] void foo() noexcept;
void foo(); void foo();

7
lexers/testdata/cpp.expected vendored
View File

@ -2,10 +2,13 @@
{"type":"CommentPreproc","value":"#include"}, {"type":"CommentPreproc","value":"#include"},
{"type":"Text","value":" "}, {"type":"Text","value":" "},
{"type":"CommentPreprocFile","value":"\"a\""}, {"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":"Text","value":" "},
{"type":"CommentPreprocFile","value":"\u003cb\u003e"}, {"type":"CommentPreprocFile","value":"\u003cb\u003e"},
{"type":"CommentPreproc","value":"\n"}, {"type":"CommentPreproc","value":" "},
{"type":"CommentSingle","value":"// comment\n"},
{"type":"Text","value":"\n"}, {"type":"Text","value":"\n"},
{"type":"NameAttribute","value":"[[nodiscard]]"}, {"type":"NameAttribute","value":"[[nodiscard]]"},
{"type":"Text","value":" "}, {"type":"Text","value":" "},