Skip to content

Merge latest commits for VSCode syntax highlighting #139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AlexPoulsen wants to merge 16 commits into
base: dev
Choose a base branch
from
Open

Merge latest commits for VSCode syntax highlighting #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
f627c58
add operator matching for vscode
AlexPoulsen May 11, 2019
ef9cf1a
add function matching and separate logical operators
AlexPoulsen May 12, 2019
40b5061
reorder =>, kw.operator, and kw.operator.logical to match correctly
AlexPoulsen May 12, 2019
cfa2d7d
fix: `<<=` was highlighted as a logical operator
AlexPoulsen May 16, 2019
d1b8418
fixed and/or, added bitwise operators i had missed
AlexPoulsen May 16, 2019
c92adfb
re-add highlighting for /, fix match scope for << and >>
AlexPoulsen May 16, 2019
98a9f2e
make sure // comments don't highlight like operators
AlexPoulsen May 16, 2019
c7cb247
add highlighting for inline c code
AlexPoulsen May 17, 2019
02d543f
reorder type and this/Self to correctly highlight
AlexPoulsen May 19, 2019
0fe0167
add matching for comma, colon, semicolon
AlexPoulsen May 19, 2019
87fcedf
update with latest files from https://github.com/AlexPoulsen/kit-vscode
AlexPoulsen Jun 24, 2019
3619e2d
add assignment operators to operator regex
AlexPoulsen Jul 10, 2019
35d2623
improve rewrite rule matching
AlexPoulsen Jul 10, 2019
8c6d87b
copy over changes from .tmLanguage to .YAML-tmLanguage
AlexPoulsen Jul 10, 2019
150a38f
add support for generic functions
AlexPoulsen Jul 11, 2019
91ae7f3
add quotes in yaml
AlexPoulsen Jul 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
186 changes: 149 additions & 37 deletions utils/vscode-kitlang/syntaxes/kit.YAML-tmLanguage
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,59 +2,171 @@ fileTypes: ["kit"]
name: Kit
scopeName: source.kit
uuid: 4fc8848b-af63-4ac5-850f-8e6b00a45004

patterns:
- match: \b(import|include|function|implement|specialize|var|using)\b
name: keyword.control.kit
- match: \b(private|public|static|const|inline)\b
name: storage.modifier.kit
- match: \b(return|throw|for|as|in|if|then|else|do|while|match|default|unsafe|implicit|sizeof)\b
name: keyword.other.kit
- match: \b(struct|enum|union|abstract|rule|rules|typedef|trait)\b
name: storage.type.kit

- captures:
'1':
name: support.type.function.kit
'2':
name: support.type.function.function.kit
'4':
name: support.type.function.input.kit
'5':
name: support.type.function.input.kit
'6':
name: support.type.function.input.kit
'7':
name: punctuation.separator.comma.kit
'8':
name: support.type.function.input.kit
'9':
name: support.type.function.input.kit
'10':
name: support.type.function.input.kit
'11':
name: keyword.control.arrow.kit
'12':
name: support.type.function.return.kit
'13':
name: support.type.function.return.kit
'14':
name: support.type.function.return.kit
match: '\b((function *)\((((([a-z_][a-zA-Z0-9_]*\.)+)?[A-Z][a-zA-Z0-9_\[\]]*)(, ))*((([a-z_][a-zA-Z0-9_]*\.)+)?[A-Z][a-zA-Z0-9_\[\]]*)\) *(->) *((([a-z_][a-zA-Z0-9_]*\.)+)?[A-Z][a-zA-Z0-9_\[\]]*))'
- name: keyword.control.kit
match: \b(import|include|function|implement|specialize|using|macro|rule|rules|typedef|trait)\b
- name: storage.modifier.kit
match: \b(private|public|static|inline)\b
- name: keyword.other.kit
match: \b(return|throw|for|as|in|if|then|else|do|while|match|default|unsafe|implicit|sizeof|continue|break)\b
- name: storage.type.kit
match: \b(struct|enum|union|abstract|var|const)\b
- name: comment.line.debug.kit
match: '(?:[\t ]*)(?''line''\/\/ printf.*)'
- name: comment.line.double-slash.kit
match: "(//).*$\n?"
- name: comment.block.kit
begin: '/\*'
end: '\*/'
- name: punctuation.separator.comma.kit
match: ','
- name: punctuation.separator.colon.kit
match: ':'
- name: punctuation.separator.semicolon.kit
match: ;
- name: keyword.control.arrow.kit
match: =\>

- name: support.type.kit
match: '\b[A-Z][a-zA-Z0-9_]*\b'
match: '=>'
- name: keyword.operator.kit
match: '(?<![\*\/\+\-\^\=\<\>\!\&\%\~\@\?\:\.])(<<=|>>=|<<|>>)(?![\*\/\+\-\^\=\<\>\!\&\%\~\@\?\:\.])'
- name: keyword.operator.logical.kit
match: '(?<![\*\/\+\-\^\=\<\>\!\&\%\~\@\?\:\.])(==|<=|>=|!=|>|<|\|\||&&|!)(?![\*\/\+\-\^\=\<\>\!\&\%\~\@\?\:\.])'
- name: keyword.operator.kit
match: '(?<![\*\/\+\-\^\=\<\>\!\&\%\~\@\?\:\.])((=|-|\+|--|\+\+|\*|%|&|\^|\||\~|\/|-=|\+=|\*=|\/=|%=)|((?<=[^\.])\.\.\.(?=[^\.]))|((?<=[^\.])\.(?=[^\.])))(?![\*\/\+\-\^\=\<\>\!\&\%\~\@\?\:\.])'
- name: keyword.operator.custom.kit
match: '[\*\/\+\-\^\=\<\>\!\&\%\~\@\?\:\.]+'
- name: variable.language.kit
match: \b(this|Self)\b
- name: invalid.illegal.macro.kit
match: '\$[A-Za-z0-9_]+\b'
- name: invalid.illegal.macro.kit
begin: '\$\{'
end: '\}'

- name: support.type.kit
match: '\b((([a-z_][a-zA-Z0-9_]*\.)+)?[A-Z][a-zA-Z0-9_]*)\b'
- name: punctuation.bracket.kit
match: '\[|\]'
- name: constant.numeric.decimal.kit
match: \b-?[0-9]+(\.[0-9]+)?(_([ui](8|16|32|64)|f(32|64)))?\b
match: '\b-?[0-9]+(\.[0-9]+)?(_([ui](8|16|32|64)|f(32|64)))?\b'
- name: constant.numeric.octal.kit
match: \b-?0o[0-7]+(_([ui](8|16|32|64)|f(32|64)))?\b
match: '\b-?0o[0-7]+(_([ui](8|16|32|64)|f(32|64)))?\b'
- name: constant.numeric.hex.kit
match: \b-?0x[0-9a-f]+(_([ui](8|16|32|64)|f(32|64)))?\b
match: '\b-?0x[0-9a-f]+(_([ui](8|16|32|64)|f(32|64)))?\b'
- name: constant.numeric.bin.kit
match: \b-?0b[01]+(_([ui](8|16|32|64)|f(32|64)))?\b

match: '\b-?0b[01]+(_([ui](8|16|32|64)|f(32|64)))?\b'
- name: string.quoted.block.kit
begin: '"""'
end: '"""'
- name: string.quoted.double.kit
match: '"(\.|[^"])*"'
match: '"(?:\\"|[^"])*"'
- name: string.character.kit
match: 'c((\''.\'')|(\''\\[abefnrtv\\\''\"?]\'')|(\''\\[01234567]{1,3}\'')|(\''\\x[0123456789aAbBcCdDeEfF]{2}\''))'
- name: string.quoted.single.kit
match: '''(\.|[^\''])*'''

- name: comment.line.double-slash.kit
match: "(//).*$\n?"
- name: comment.block.kit
begin: '/\*'
end: '\*/'

match: '''(?:\\''|[^''])*'''
- name: constant.language.kit
match: \b(true|false|null)\b

- name: keyword.operator.expression.kit
match: '(```( )*:(?=( )*\b[A-Z][a-zA-Z0-9_]*\b( )*;))|(```)'
- name: markup.heading.metadata.kit
begin: '\#\['
end: '\]'

- name: variable.function.main.kit
match: '((?<=function )\bmain(?=\()\b)'
- name: variable.function.print.kit
match: '(\bprintf(?=\()\b)|((?<!function )\bprint[a-zA-Z0-9_]*(?=\()\b)'
- name: variable.function.constructor.kit
match: '(?<=\.)\bnew[a-zA-Z0-9_]*(?=\()\b'
- name: variable.function.allocation.kit
match: '(?<!function )((\bmalloc(?=\())|(\balloc(?=\())|(\brealloc(?=\())|(\bfree(?=\())|(\bcalloc(?=\()))'
- name: variable.function.kit
match: '(((?<=function )\b[a-z_][A-Za-z0-9_]*(?=\[[A-Z][A-Za-z0-9_]*\]\()))|(\b[a-z_][A-Za-z0-9_]*(?=\()\b)'
- name: variable.parameter.kit
match: \b[a-z_][A-Za-z0-9_]*\b
match: '\b[a-z_][A-Za-z0-9_]*\b'
- name: meta.preprocessor.rewrite.identifier.kit
match: '\$[A-Za-z0-9_]+\b'
- captures:
'1':
name: meta.preprocessor.rewrite.dollarsign.kit
'2':
name: meta.preprocessor.rewrite.variable.kit
'3':
name: meta.preprocessor.rewrite.colon.kit
'6':
name: meta.preprocessor.rewrite.type.kit
'7':
name: meta.preprocessor.rewrite.type.kit
'8':
name: meta.preprocessor.rewrite.type.kit
'9':
name: punctuation.separator.comma.kit
'10':
name: meta.preprocessor.rewrite.type.kit
'11':
name: meta.preprocessor.rewrite.type.kit
'12':
name: meta.preprocessor.rewrite.type.kit
'14':
name: meta.preprocessor.rewrite.type.kit
'15':
name: meta.preprocessor.rewrite.type.kit
'16':
name: meta.preprocessor.rewrite.type.kit
'17':
name: meta.preprocessor.rewrite.dollarsign.kit
'18':
name: meta.preprocessor.rewrite.dollarsign.kit
'19':
name: meta.preprocessor.rewrite.variable.kit
'20':
name: meta.preprocessor.rewrite.colon.kit
'21':
name: support.type.function.kit
'23':
name: support.type.function.function.kit
'25':
name: support.type.function.input.kit
'26':
name: support.type.function.input.kit
'27':
name: support.type.function.input.kit
'28':
name: punctuation.separator.comma.kit
'29':
name: support.type.function.input.kit
'30':
name: support.type.function.input.kit
'31':
name: support.type.function.input.kit
'32':
name: keyword.control.arrow.kit
'33':
name: support.type.function.return.kit
'34':
name: support.type.function.return.kit
'35':
name: support.type.function.return.kit
'36':
name: meta.preprocessor.rewrite.dollarsign.kit
match: '(\$\{)([a-z_][A-Za-z0-9_]*)(:)( *)(\((((([a-z_][a-zA-Z0-9_]*\.)+)?[A-Z][a-zA-Z0-9_\[\]]*)(, ))*((([a-z_][a-zA-Z0-9_]*\.)+)?[A-Z][a-zA-Z0-9_\[\]]*)\)|((([a-z_][a-zA-Z0-9_]*\.)+)?[A-Z][a-zA-Z0-9_\[\]]*))(\})|(\$\{)([a-z_][A-Za-z0-9_]*)(:)( *)((function *)\((((([a-z_][a-zA-Z0-9_]*\.)+)?[A-Z][a-zA-Z0-9_\[\]]*)(, ))*((([a-z_][a-zA-Z0-9_]*\.)+)?[A-Z][a-zA-Z0-9_\[\]]*)\) *(->) *((([a-z_][a-zA-Z0-9_]*\.)+)?[A-Z][a-zA-Z0-9_\[\]]*))(\})'
Loading