641255c · helix · git.iko.soy

git.iko.soy/helix

Add llvm-mir highlighting (#1398)

* Add injection regex for more languages To support embedding them in other languages like markdown. * Add llvm-mir highlighting LLVM Machine IR is dumped as yaml files that can embed LLVM IR and Machine IR. To support this, add a llvm-mir-yaml language that uses the yaml parser, but uses different injections to highlight IR and MIR. * Update submodule with fixed multiline comments Co-authored-by: Blaž Hrastnik <blaz@mxxn.io>

commit641255ccc83648d164bf6e8e8e4e93460591830b authorSebastian Neubauer <Flakebi@users.noreply.github.com> dateTue 4 Jan 2022, 02:52 (5 years ago) parent7c9d368

14 files changed+203−3

compare with master

unifiedsplit

.gitmodules+4 book/src/generated/lang-support.md+2 helix-core/src/indent.rs+1 helix-core/src/syntax.rs+10−3 helix-syntax/languages/tree-sitter-llvm-mir+1 languages.toml+22 runtime/queries/llvm-mir-yaml/highlights.scm+1 runtime/queries/llvm-mir-yaml/indents.toml+3 runtime/queries/llvm-mir-yaml/injections.scm+9 runtime/queries/llvm-mir/highlights.scm+136 runtime/queries/llvm-mir/indents.toml+7 runtime/queries/llvm-mir/injections.scm+2 runtime/queries/llvm-mir/textobjects.scm+3 runtime/queries/yaml/injections.scm+2

.gitmodules+4

@@ -174,6 +174,10 @@

174174 path = helix-syntax/languages/tree-sitter-git-commit

175175 url = https://github.com/the-mikedavis/tree-sitter-git-commit.git

176176 shallow = true

177+[submodule "helix-syntax/languages/tree-sitter-llvm-mir"]

178+ path = helix-syntax/languages/tree-sitter-llvm-mir

179+ url = https://github.com/Flakebi/tree-sitter-llvm-mir.git

180+ shallow = true

177181[submodule "helix-syntax/languages/tree-sitter-git-diff"]

178182 path = helix-syntax/languages/tree-sitter-git-diff

179183 url = https://github.com/the-mikedavis/tree-sitter-git-diff.git

book/src/generated/lang-support.md+2

@@ -24,6 +24,8 @@

2424| latex | ✓ | | | |

2525| ledger | ✓ | | | |

2626| llvm | ✓ | ✓ | ✓ | |

27+| llvm-mir | ✓ | ✓ | ✓ | |

28+| llvm-mir-yaml | ✓ | | ✓ | |

2729| lua | ✓ | | ✓ | |

2830| markdown | ✓ | | | |

helix-core/src/indent.rs+1

@@ -436,6 +436,7 @@ where

436436 comment_token: None,

437437 auto_format: false,

438438 diagnostic_severity: Severity::Warning,

439+ tree_sitter_library: None,

439440 language_server: None,

440441 indent: Some(IndentationConfiguration {

441442 tab_width: 4,

helix-core/src/syntax.rs+10−3

@@ -67,6 +67,8 @@ pub struct LanguageConfiguration {

6767 #[serde(default)]

6868 pub diagnostic_severity: Severity,

6969

70+ pub tree_sitter_library: Option<String>, // tree-sitter library name, defaults to language_id

71+

7072 // content_regex

7173 #[serde(default, skip_serializing, deserialize_with = "deserialize_regex")]

7274 pub injection_regex: Option<Regex>,

@@ -192,9 +194,14 @@ impl LanguageConfiguration {

192194 if highlights_query.is_empty() {

193195 None

194196 } else {

195− let language = get_language(&crate::RUNTIME_DIR, &self.language_id)

196− .map_err(|e| log::info!("{}", e))

197− .ok()?;

197+ let language = get_language(

198+ &crate::RUNTIME_DIR,

199+ self.tree_sitter_library

200+ .as_deref()

201+ .unwrap_or(&self.language_id),

202+ )

203+ .map_err(|e| log::info!("{}", e))

204+ .ok()?;

198205 let config = HighlightConfiguration::new(

199206 language,

200207 &highlights_query,

helix-syntax/languages/tree-sitter-llvm-mirnew file+1

Submodule changed.

languages.toml+22

@@ -334,6 +334,7 @@ file-types = ["yml", "yaml"]

334334roots = []

335335comment-token = "#"

336336indent = { tab-width = 2, unit = " " }

337+injection-regex = "yml|yaml"

337338

338339# [[language]]

339340# name = "haskell"

@@ -386,6 +387,7 @@ roots = []

386387comment-token = "#"

387388indent = { tab-width = 2, unit = " " }

388389language-server = { command = "cmake-language-server" }

390+injection-regex = "cmake"

389391

390392[[language]]

391393name = "glsl"

@@ -394,6 +396,7 @@ file-types = ["glsl", "vert", "tesc", "tese", "geom", "frag", "comp" ]

394396roots = []

395397comment-token = "//"

396398indent = { tab-width = 4, unit = " " }

399+injection-regex = "glsl"

397400

398401[[language]]

399402name = "perl"

@@ -435,6 +438,25 @@ roots = []

435438file-types = ["ll"]

436439comment-token = ";"

437440indent = { tab-width = 2, unit = " " }

441+injection-regex = "llvm"

442+

443+[[language]]

444+name = "llvm-mir"

445+scope = "source.llvm_mir"

446+roots = []

447+file-types = []

448+comment-token = ";"

449+indent = { tab-width = 2, unit = " " }

450+injection-regex = "mir"

451+

452+[[language]]

453+name = "llvm-mir-yaml"

454+tree-sitter-library = "yaml"

455+scope = "source.yaml"

456+roots = []

457+file-types = ["mir"]

458+comment-token = "#"

459+indent = { tab-width = 2, unit = " " }

438460

439461[[language]]

440462name = "tablegen"

runtime/queries/llvm-mir-yaml/highlights.scmnew file+1

@@ -0,0 +1 @@

1+; inherits: yaml

runtime/queries/llvm-mir-yaml/indents.tomlnew file+3

@@ -0,0 +1,3 @@

1+indent = [

2+ "block_mapping_pair",

3+]

runtime/queries/llvm-mir-yaml/injections.scmnew file+9

@@ -0,0 +1,9 @@

1+; inherits: yaml

3+((document (block_node (block_scalar) @injection.content))

4+ (#set! injection.language "llvm"))

6+((document (block_node (block_mapping (block_mapping_pair

7+ key: (flow_node (plain_scalar (string_scalar))) ; "body"

8+ value: (block_node (block_scalar) @injection.content)))))

9+ (#set! injection.language "mir"))

runtime/queries/llvm-mir/highlights.scmnew file+136

@@ -0,0 +1,136 @@

1+[

2+ (label)

3+ (bb_ref)

4+] @label

6+[

7+ (comment)

8+ (multiline_comment)

9+] @comment

10+

11+[

12+ "("

13+ ")"

14+ "["

15+ "]"

16+ "{"

17+ "}"

18+ "<"

19+ ">"

20+] @punctuation.bracket

21+

22+[

23+ ","

24+ ":"

25+ "|"

26+ "*"

27+] @punctuation.delimiter

28+

29+[

30+ "="

31+ "x"

32+] @operator

33+

34+[

35+ "true"

36+ "false"

37+] @constant.builtin.boolean

38+

39+[

40+ "null"

41+ "_"

42+ "unknown-address"

43+] @constant.builtin

44+

45+[

46+ (stack_object)

47+ (constant_pool_index)

48+ (jump_table_index)

49+ (var)

50+ (physical_register)

51+ (ir_block)

52+ (external_symbol)

53+ (global_var)

54+ (ir_local_var)

55+ (metadata_ref)

56+ (mnemonic)

57+] @variable

58+

59+(low_level_type) @type

60+

61+[

62+ (immediate_type)

63+ (primitive_type)

64+] @type.builtin

65+

66+(number) @constant.numeric.integer

67+(float) @constant.numeric.float

68+(string) @string

69+

70+(instruction name: _ @keyword.operator)

71+

72+[

73+ "successors"

74+ "liveins"

75+ "pre-instr-symbol"

76+ "post-instr-symbol"

77+ "heap-alloc-marker"

78+ "debug-instr-number"

79+ "debug-location"

80+ "mcsymbol"

81+ "tied-def"

82+ "target-flags"

83+ "CustomRegMask"

84+ "same_value"

85+ "def_cfa_register"

86+ "restore"

87+ "undefined"

88+ "offset"

89+ "rel_offset"

90+ "def_cfa"

91+ "llvm_def_aspace_cfa"

92+ "register"

93+ "escape"

94+ "remember_state"

95+ "restore_state"

96+ "window_save"

97+ "negate_ra_sign_state"

98+ "intpred"

99+ "floatpred"

100+ "shufflemask"

101+ "liveout"

102+ "target-index"

103+ "blockaddress"

104+ "intrinsic"

105+ "load"

106+ "store"

107+ "unknown-size"

108+ "on"

109+ "from"

110+ "into"

111+ "align"

112+ "basealign"

113+ "addrspace"

114+ "call-entry"

115+ "custom"

116+ "constant-pool"

117+ "stack"

118+ "got"

119+ "jump-table"

120+ "syncscope"

121+ "address-taken"

122+ "landing-pad"

123+ "inlineasm-br-indirect-target"

124+ "ehfunclet-entry"

125+ "bbsections"

126+

127+ (intpred)

128+ (floatpred)

129+ (memory_operand_flag)

130+ (atomic_ordering)

131+ (register_flag)

132+ (instruction_flag)

133+ (float_keyword)

134+] @keyword

135+

136+(ERROR) @error

runtime/queries/llvm-mir/indents.tomlnew file+7

@@ -0,0 +1,7 @@

1+indent = [

2+ "basic_block",

3+]

5+outdent = [

6+ "label",

7+]

runtime/queries/llvm-mir/injections.scmnew file+2

@@ -0,0 +1,2 @@

1+([ (comment) (multiline_comment)] @injection.content

2+ (#set! injection.language "comment"))

runtime/queries/llvm-mir/textobjects.scmnew file+3

@@ -0,0 +1,3 @@

1+(basic_block) @function.around

3+(argument) @parameter.inside

runtime/queries/yaml/injections.scmnew file+2

@@ -0,0 +1,2 @@

1+((comment) @injection.content

2+ (#set! injection.language "comment"))