4cc5623 · helix · git.iko.soy

git.iko.soy/helix

Improve docs, fix up a few highlight scopes

commit4cc562318a9987d58384fdb4e88e5a1f59f25a19 authorBlaž Hrastnik <blaz@mxxn.io> dateTue 7 Sep 2021, 13:00 (5 years ago) parent4ac2943

14 files changed+265−207

compare with master

unifiedsplit

book/book.toml+2−1 book/src/configuration.md+13 book/src/from-vim.md+2 book/src/install.md+3−1 book/src/keymap.md+52−48 book/src/themes.md+124−78 book/theme/css/general.css+13 book/theme/css/variables.css+14−10 book/theme/highlight.css+37−64 runtime/queries/ocaml/highlights.scm+1−1 runtime/queries/rust/highlights.scm+1−1 runtime/themes/dark_plus.toml+1 runtime/themes/monokai.toml+1 theme.toml+1−3

book/book.toml+2−1

@@ -3,8 +3,9 @@ authors = ["Blaž Hrastnik"]

33language = "en"

44multilingual = false

55src = "src"

6−theme = "colibri"

76edit-url-template = "https://github.com/helix-editor/helix/tree/master/book/{path}?mode=edit"

98[output.html]

109cname = "docs.helix-editor.com"

10+default-theme = "colibri"

11+preferred-dark-theme = "colibri"

book/src/configuration.md+13

@@ -5,6 +5,19 @@ To override global configuration parameters, create a `config.toml` file located

55* Linux and Mac: `~/.config/helix/config.toml`

66* Windows: `%AppData%\helix\config.toml`

8+## Editor

10+`[editor]` section of the config.

11+

12+| Key | Description | Default |

13+|--|--|---------|

14+| `scrolloff` | Number of lines of padding around the edge of the screen when scrolling. | `3` |

15+| `mouse` | Enable mouse mode. | `true` |

16+| `middle-click-paste` | Middle click paste support. | `true` |

17+| `scroll-lines` | Number of lines to scroll per scroll wheel step. | `3` |

18+| `shell` | Shell to use when running external commands. | Unix: `["sh", "-c"]`<br/>Windows: `["cmd", "/C"]` |

19+| `line-number` | Line number display (`absolute`, `relative`) | `absolute` |

20+

821## LSP

922

1023To display all language server messages in the status line add the following to your `config.toml`:

book/src/from-vim.md+2

@@ -7,4 +7,6 @@ going to act on (a word, a paragraph, a line, etc) is selected first and the

77action itself (delete, change, yank, etc) comes second. A cursor is simply a

88single width selection.

10+See also Kakoune's [Migrating from Vim](https://github.com/mawww/kakoune/wiki/Migrating-from-Vim).

11+

1012> TODO: Mention texobjects, surround, registers

book/src/install.md+3−1

@@ -23,7 +23,9 @@ shell for working on Helix.

2323

2424### Arch Linux

2525

26−Binary packages are available on AUR:

26+Releases are available in the `community` repository.

27+

28+Packages are also available on AUR:

2729- [helix-bin](https://aur.archlinux.org/packages/helix-bin/) contains the pre-built release

2830- [helix-git](https://aur.archlinux.org/packages/helix-git/) builds the master branch

2931

book/src/keymap.md+52−48

@@ -4,7 +4,7 @@

55### Movement

7−> NOTE: `f`, `F`, `t` and `T` are not confined to the current line.

7+> NOTE: Unlike vim, `f`, `F`, `t` and `T` are not confined to the current line.

99| Key | Description | Command |

1010| ----- | ----------- | ------- |

@@ -28,14 +28,14 @@

2828| `PageDown` | Move page down | `page_down` |

2929| `Ctrl-u` | Move half page up | `half_page_up` |

3030| `Ctrl-d` | Move half page down | `half_page_down` |

31−| `Ctrl-i` | Jump forward on the jumplist TODO: conflicts tab | `jump_forward` |

31+| `Ctrl-i` | Jump forward on the jumplist | `jump_forward` |

3232| `Ctrl-o` | Jump backward on the jumplist | `jump_backward` |

3333| `v` | Enter [select (extend) mode](#select--extend-mode) | `select_mode` |

3434| `g` | Enter [goto mode](#goto-mode) | N/A |

3535| `m` | Enter [match mode](#match-mode) | N/A |

3636| `:` | Enter command mode | `command_mode` |

3737| `z` | Enter [view mode](#view-mode) | N/A |

38−| `Ctrl-w` | Enter [window mode](#window-mode) (maybe will be remove for spc w w later) | N/A |

38+| `Ctrl-w` | Enter [window mode](#window-mode) | N/A |

3939| `Space` | Enter [space mode](#space-mode) | N/A |

4040| `K` | Show documentation for the item under the cursor | `hover` |

4141

@@ -66,6 +66,16 @@

6666| `d` | Delete selection | `delete_selection` |

6767| `c` | Change selection (delete and enter insert mode) | `change_selection` |

6868

69+#### Shell

70+

71+| Key | Description | Command |

72+| ------ | ----------- | ------- |

75+| `!` | Run shell command, inserting output before each selection | `shell_insert_output` |

76+| `A-!` | Run shell command, appending output after each selection | `shell_append_output` |

77+

78+

6979### Selection manipulation

7080

7181| Key | Description | Command |

@@ -87,17 +97,10 @@

8797| | Expand selection to parent syntax node TODO: pick a key | `expand_selection` |

8898| `J` | Join lines inside selection | `join_selections` |

8999| `K` | Keep selections matching the regex TODO: overlapped by hover help | `keep_selections` |

100+| `$` | Pipe each selection into shell command, keep selections where command returned 0 | `shell_keep_pipe` |

90101| `Space` | Keep only the primary selection TODO: overlapped by space mode | `keep_primary_selection` |

91102| `Ctrl-c` | Comment/uncomment the selections | `toggle_comments` |

92103

93−### Insert Mode

94−

95−| Key | Description | Command |

96−| ----- | ----------- | ------- |

97−| `Escape` | Switch to normal mode | `normal_mode` |

98−| `Ctrl-x` | Autocomplete | `completion` |

99−| `Ctrl-w` | Delete previous word | `delete_word_backward` |

100−

101104### Search

102105

103106> TODO: The search implementation isn't ideal yet -- we don't support searching

@@ -110,38 +113,11 @@ in reverse, or searching via smartcase.

110113| `N` | Add next search match to selection | `extend_search_next` |

111114| `*` | Use current selection as the search pattern | `search_selection` |

112115

113−### Unimpaired

114−

115−Mappings in the style of [vim-unimpaired](https://github.com/tpope/vim-unimpaired)

116−

117−| Key | Description | Command |

118−| ----- | ----------- | ------- |

119−| `[d` | Go to previous diagnostic | `goto_prev_diag` |

120−| `]d` | Go to next diagnostic | `goto_next_diag` |

121−| `[D` | Go to first diagnostic in document | `goto_first_diag` |

122−| `]D` | Go to last diagnostic in document | `goto_last_diag` |

123−| `[space` | Add newline above | `add_newline_above` |

124−| `]space` | Add newline below | `add_newline_below` |

125−

126−### Shell

116+### Minor modes

127117

128−| Key | Description | Command |

129−| ------ | ----------- | ------- |

130−| `\|` | Pipe each selection through shell command, replacing with output | `shell_pipe` |

131−| `A-\|` | Pipe each selection into shell command, ignoring output | `shell_pipe_to` |

132−| `!` | Run shell command, inserting output before each selection | `shell_insert_output` |

133−| `A-!` | Run shell command, appending output after each selection | `shell_append_output` |

134−| `$` | Pipe each selection into shell command, keep selections where command returned 0 | `shell_keep_pipe` |

135−

136−## Select / extend mode

137−

138−I'm still pondering whether to keep this mode or not. It changes movement

139−commands to extend the existing selection instead of replacing it.

140−

141−> NOTE: It's a bit confusing at the moment because extend hasn't been

142−> implemented for all movement commands yet.

118+These sub-modes are accessible from normal mode and typically switch back to normal mode after a command.

143119

144−## View mode

120+#### View mode

145121

146122View mode is intended for scrolling and manipulating the view without changing

147123the selection.

@@ -155,7 +131,7 @@ the selection.

155131| `j` | Scroll the view downwards | `scroll_down` |

156132| `k` | Scroll the view upwards | `scroll_up` |

157133

158−## Goto mode

134+#### Goto mode

159135

160136Jumps to various locations.

161137

@@ -177,7 +153,7 @@ Jumps to various locations.

177153| `i` | Go to implementation | `goto_implementation` |

178154| `a` | Go to the last accessed/alternate file | `goto_last_accessed_file` |

179155

180−## Match mode

156+#### Match mode

181157

182158Enter this mode using `m` from normal mode. See the relavant section

183159in [Usage](./usage.md) for an explanation about [surround](./usage.md#surround)

@@ -192,11 +168,9 @@ and [textobject](./usage.md#textobject) usage.

192168| `a` `<object>` | Select around textobject | `select_textobject_around` |

193169| `i` `<object>` | Select inside textobject | `select_textobject_inner` |

194170

195−## Object mode

196−

197171TODO: Mappings for selecting syntax nodes (a superset of `[`).

198172

199−## Window mode

173+#### Window mode

200174

201175This layer is similar to vim keybindings as kakoune does not support window.

202176

@@ -207,9 +181,9 @@ This layer is similar to vim keybindings as kakoune does not support window.

207181| `h`, `Ctrl-h` | Horizontal bottom split | `hsplit` |

208182| `q`, `Ctrl-q` | Close current window | `wclose` |

209183

210−## Space mode

184+#### Space mode

211185

212−This layer is a kludge of mappings I had under leader key in neovim.

186+This layer is a kludge of mappings, mostly pickers.

213187

214188| Key | Description | Command |

215189| ----- | ----------- | ------- |

@@ -226,6 +200,36 @@ This layer is a kludge of mappings I had under leader key in neovim.

226200| `Y` | Yank main selection to clipboard | `yank_main_selection_to_clipboard` |

227201| `R` | Replace selections by clipboard contents | `replace_selections_with_clipboard` |

228202

203+

204+#### Unimpaired

205+

206+Mappings in the style of [vim-unimpaired](https://github.com/tpope/vim-unimpaired).

207+

208+| Key | Description | Command |

209+| ----- | ----------- | ------- |

210+| `[d` | Go to previous diagnostic | `goto_prev_diag` |

211+| `]d` | Go to next diagnostic | `goto_next_diag` |

212+| `[D` | Go to first diagnostic in document | `goto_first_diag` |

213+| `]D` | Go to last diagnostic in document | `goto_last_diag` |

214+| `[space` | Add newline above | `add_newline_above` |

215+| `]space` | Add newline below | `add_newline_below` |

216+

217+## Insert Mode

218+

219+| Key | Description | Command |

220+| ----- | ----------- | ------- |

221+| `Escape` | Switch to normal mode | `normal_mode` |

222+| `Ctrl-x` | Autocomplete | `completion` |

223+| `Ctrl-w` | Delete previous word | `delete_word_backward` |

224+

225+## Select / extend mode

226+

227+I'm still pondering whether to keep this mode or not. It changes movement

228+commands (including goto) to extend the existing selection instead of replacing it.

229+

230+> NOTE: It's a bit confusing at the moment because extend hasn't been

231+> implemented for all movement commands yet.

232+

229233# Picker

230234

231235Keys to use within picker. Remapping currently not supported.

book/src/themes.md+124−78

@@ -30,85 +30,9 @@ if the key contains a dot `'.'`, it must be quoted to prevent it being parsed as

3030"key.key" = "#ffffff"

3131```

3232

33−Possible modifiers:

33+### Color palettes

3434

35−| Modifier |

36−| --- |

37−| `bold` |

38−| `dim` |

39−| `italic` |

40−| `underlined` |

41−| `slow\_blink` |

42−| `rapid\_blink` |

43−| `reversed` |

44−| `hidden` |

45−| `crossed\_out` |

46−

47−Possible keys:

48−

49−| Key | Notes |

50−| --- | --- |

51−| `attribute` | |

52−| `keyword` | |

53−| `keyword.directive` | Preprocessor directives (\#if in C) |

54−| `keyword.control` | Control flow |

55−| `namespace` | |

56−| `punctuation` | |

57−| `punctuation.delimiter` | |

58−| `operator` | |

59−| `special` | |

60−| `property` | |

61−| `variable` | |

62−| `variable.parameter` | |

63−| `type` | |

64−| `type.builtin` | |

65−| `type.enum.variant` | Enum variants |

66−| `constructor` | |

67−| `function` | |

68−| `function.macro` | |

69−| `function.builtin` | |

70−| `comment` | |

71−| `variable.builtin` | |

72−| `constant` | |

73−| `constant.builtin` | |

74−| `string` | |

75−| `number` | |

76−| `escape` | Escaped characters |

77−| `label` | For lifetimes |

78−| `module` | |

79−| `ui.background` | |

80−| `ui.cursor` | |

81−| `ui.cursor.insert` | |

82−| `ui.cursor.select` | |

83−| `ui.cursor.match` | Matching bracket etc. |

84−| `ui.cursor.primary` | Cursor with primary selection |

85−| `ui.linenr` | |

86−| `ui.linenr.selected` | |

87−| `ui.statusline` | |

88−| `ui.statusline.inactive` | |

89−| `ui.popup` | |

90−| `ui.window` | |

91−| `ui.help` | |

92−| `ui.text` | |

93−| `ui.text.focus` | |

94−| `ui.info` | |

95−| `ui.info.text` | |

96−| `ui.menu` | |

97−| `ui.menu.selected` | |

98−| `ui.selection` | For selections in the editing area |

99−| `ui.selection.primary` | |

100−| `warning` | LSP warning |

101−| `error` | LSP error |

102−| `info` | LSP info |

103−| `hint` | LSP hint |

104−

105−These keys match [tree-sitter scopes](https://tree-sitter.github.io/tree-sitter/syntax-highlighting#theme). We half-follow the common scopes from [macromates language grammars](https://macromates.com/manual/en/language_grammars) with some differences.

106−

107−For a given highlight produced, styling will be determined based on the longest matching theme key. So it's enough to provide function to highlight `function.macro` and `function.builtin` as well, but you can use more specific scopes to highlight specific cases differently.

108−

109−## Color palettes

110−

111−You can define a palette of named colors, and refer to them from the

35+It's recommended define a palette of named colors, and refer to them from the

11236configuration values in your theme. To do this, add a table called

11337`palette` to your theme file:

11438

@@ -146,3 +70,125 @@ over it and is merged into the default palette.

14670| `light-cyan` |

14771| `light-gray` |

14872| `white` |

73+

74+### Modifiers

75+

76+The following values may be used as modifiers.

77+

78+Less common modifiers might not be supported by your terminal emulator.

79+

80+| Modifier |

81+| --- |

82+| `bold` |

83+| `dim` |

84+| `italic` |

85+| `underlined` |

86+| `slow_blink` |

87+| `rapid_blink` |

88+| `reversed` |

89+| `hidden` |

90+| `crossed_out` |

91+

92+### Scopes

93+

94+The following is a list of scopes available to use for styling.

95+

96+#### Syntax highlighting

97+

98+These keys match [tree-sitter scopes](https://tree-sitter.github.io/tree-sitter/syntax-highlighting#theme).

99+

100+For a given highlight produced, styling will be determined based on the longest matching theme key. For example, the highlight `function.builtin.static` would match the key `function.builtin` rather than `function`.

101+

102+We use a similar set of scopes as

103+[SublimeText](https://www.sublimetext.com/docs/scope_naming.html). See also

104+[TextMate](https://macromates.com/manual/en/language_grammars) scopes.

105+

106+- `escape` (TODO: rename to (constant).character.escape)

107+

108+- `type` - Types

109+ - `builtin` - Primitive types provided by the language (`int`, `usize`)

110+

111+- `constant` (TODO: constant.other.placeholder for %v)

112+ - `builtin` Special constants provided by the language (`true`, `false`, `nil` etc)

113+ - `boolean`

114+ - `character`

115+

116+- `number` (TODO: rename to constant.number/.numeric.{integer, float, complex})

117+- `string` (TODO: string.quoted.{single, double}, string.raw/.unquoted)?

118+ - `regexp` - Regular expressions

119+ - `special`

120+ - `path`

121+ - `url`

122+

123+- `comment` - Code comments

124+ - `line` - Single line comments (`//`)

125+ - `block` - Block comments (e.g. (`/* */`)

126+ - `documentation` - Documentation comments (e.g. `///` in Rust)

127+

128+- `variable` - Variables

129+ - `builtin` - Reserved language variables (`self`, `this`, `super`, etc)

130+ - `parameter` - Function parameters

131+ - `property`

132+ - `function` (TODO: ?)

133+

134+- `label`

135+

136+- `punctuation`

137+ - `delimiter` - Commas, colons

138+ - `bracket` - Parentheses, angle brackets, etc.

139+

140+- `keyword`

141+ - `control`

142+ - `conditional` - `if`, `else`

143+ - `repeat` - `for`, `while`, `loop`

144+ - `import` - `import`, `export`

145+ - (TODO: return?)

146+ - `directive` - Preprocessor directives (`#if` in C)

147+ - `function` - `fn`, `func`

148+

149+- `operator` - `||`, `+=`, `>`, `or`

150+

151+- `function`

152+ - `builtin`

153+ - `method`

154+ - `macro`

155+ - `special` (preprocesor in C)

156+

157+- `tag` - Tags (e.g. `<body>` in HTML)

158+

159+- `namespace`

160+

161+#### Interface

162+

163+These scopes are used for theming the editor interface.

164+

165+

166+| Key | Notes |

167+| --- | --- |

168+| `ui.background` | |

169+| `ui.cursor` | |

170+| `ui.cursor.insert` | |

171+| `ui.cursor.select` | |

172+| `ui.cursor.match` | Matching bracket etc. |

173+| `ui.cursor.primary` | Cursor with primary selection |

174+| `ui.linenr` | |

175+| `ui.linenr.selected` | |

176+| `ui.statusline` | Statusline |

177+| `ui.statusline.inactive` | Statusline (unfocused document) |

178+| `ui.popup` | |

179+| `ui.window` | |

180+| `ui.help` | |

181+| `ui.text` | |

182+| `ui.text.focus` | |

183+| `ui.info` | |

184+| `ui.info.text` | |

185+| `ui.menu` | |

186+| `ui.menu.selected` | |

187+| `ui.selection` | For selections in the editing area |

188+| `ui.selection.primary` | |

189+| `warning` | Diagnostics warning |

190+| `error` | Diagnostics error |

191+| `info` | Diagnostics info |

192+| `hint` | Diagnostics hint |

193+

194+

book/theme/css/general.css+13

@@ -114,6 +114,19 @@ h6:target::before {

114114 margin-bottom: .875em;

115115}

116116

117+.content ul li {

118+margin-bottom: .25rem;

119+}

120+.content ul {

121+ list-style-type: square;

122+}

123+.content ul ul, .content ol ul {

124+ margin-bottom: .5rem;

125+}

126+.content li p {

127+ margin-bottom: .5em;

128+}

129+

117130.content p { line-height: 1.45em; }

118131.content ol { line-height: 1.45em; }

119132.content ul { line-height: 1.45em; }

book/theme/css/variables.css+14−10

@@ -69,7 +69,7 @@

6969

7070 --links: #2b79a2;

7171

72− --inline-code-color: #c5c8c6;;

72+ --inline-code-color: #c5c8c6;

7373

7474 --theme-popup-bg: #141617;

7575 --theme-popup-border: #43484d;

@@ -110,7 +110,7 @@

110110

111111 --links: #20609f;

112112

113− --inline-code-color: #301900;

113+ --inline-code-color: #a39e9b;

114114

115115 --theme-popup-bg: #fafafa;

116116 --theme-popup-border: #cccccc;

@@ -151,7 +151,7 @@

151151

152152 --links: #2b79a2;

153153

154− --inline-code-color: #c5c8c6;;

154+ --inline-code-color: #c5c8c6;

155155

156156 --theme-popup-bg: #161923;

157157 --theme-popup-border: #737480;

@@ -192,7 +192,7 @@

192192

193193 --links: #2b79a2;

194194

195− --inline-code-color: #6e6b5e;

195+ --inline-code-color: #c5c8c6;

196196

197197 --theme-popup-bg: #e1e1db;

198198 --theme-popup-border: #b38f6b;

@@ -234,7 +234,7 @@

234234

235235 --links: #2b79a2;

236236

237− --inline-code-color: #c5c8c6;;

237+ --inline-code-color: #6e6b5e;

238238

239239 --theme-popup-bg: #141617;

240240 --theme-popup-border: #43484d;

@@ -261,6 +261,7 @@

261261.colibri {

262262 --bg: #3b224c;

263263 --fg: #bcbdd0;

264+ --heading-fg: #fff;

264265

265266 --sidebar-bg: #281733;

266267 --sidebar-fg: #c8c9db;

@@ -276,18 +277,19 @@

276277 /* --links: #a4a0e8; */

277278 --links: #ECCDBA;

278279

279− --inline-code-color: #c5c8c6;;

280+ --inline-code-color: hsl(48.7, 7.8%, 70%);

280281

281282 --theme-popup-bg: #161923;

282283 --theme-popup-border: #737480;

283284 --theme-hover: rgba(0,0,0, .2);

284285

285− --quote-bg: hsl(226, 15%, 17%);

286+ --quote-bg: #281733;

286287 --quote-border: hsl(226, 15%, 22%);

287288

288− --table-border-color: hsl(226, 23%, 16%);

289− --table-header-bg: hsl(226, 23%, 31%);

289+ --table-border-color: hsl(226, 23%, 76%);

290+ --table-header-bg: hsla(226, 23%, 31%, 0);

290291 --table-alternate-bg: hsl(226, 23%, 14%);

292+ --table-border-line: hsla(201deg, 20%, 92%, 0.2);

291293

292294 --searchbar-border-color: #aaa;

293295 --searchbar-bg: #aeaec6;

@@ -300,6 +302,7 @@

300302}

301303

302304.colibri {

305+/*

303306 --bg: #ffffff;

304307 --fg: #452859;

305308 --fg: #5a5977;

@@ -318,7 +321,7 @@

318321

319322 --links: #6F44F0;

320323

321− --inline-code-color: #697C81;

324+ --inline-code-color: #a39e9b;

322325

323326 --theme-popup-bg: #161923;

324327 --theme-popup-border: #737480;

@@ -341,4 +344,5 @@

341344 --searchresults-border-color: #5c5c68;

342345 --searchresults-li-bg: #242430;

343346 --search-mark-bg: #a2cff5;

347+*/

344348}

book/theme/highlight.css+37−64

@@ -1,83 +1,56 @@

1−/*

2− * An increased contrast highlighting scheme loosely based on the

3− * "Base16 Atelier Dune Light" theme by Bram de Haan

4− * (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/dune)

5− * Original Base16 color scheme by Chris Kempson

6− * (https://github.com/chriskempson/base16)

7− */

8−

9−/* Comment */

1+pre code.hljs {

2+ display:block;

3+ overflow-x:auto;

4+ padding:1em

5+}

6+code.hljs {

7+ padding:3px 5px

8+}

9+.hljs {

10+ background:#2f1e2e;

11+ color:#a39e9b

12+}

1013.hljs-comment,

1114.hljs-quote {

12− color: #575757;

15+ color:#8d8687

1316}

14−

15−/* Red */

16−.hljs-variable,

17−.hljs-template-variable,

18−.hljs-attribute,

19−.hljs-tag,

20−.hljs-name,

21−.hljs-regexp,

2217.hljs-link,

18+.hljs-meta,

2319.hljs-name,

20+.hljs-regexp,

21+.hljs-selector-class,

2422.hljs-selector-id,

25−.hljs-selector-class {

26− color: #d70025;

23+.hljs-tag,

24+.hljs-template-variable,

25+.hljs-variable {

26+ color:#ef6155

2727}

28−

29−/* Orange */

30−.hljs-number,

31−.hljs-meta,

3228.hljs-built_in,

33−.hljs-builtin-name,

29+.hljs-deletion,

3430.hljs-literal,

35−.hljs-type,

36−.hljs-params {

37− color: #b21e00;

31+.hljs-number,

32+.hljs-params,

33+.hljs-type {

34+ color:#f99b15

3835}

39−

40−/* Green */

41−.hljs-string,

42−.hljs-symbol,

43−.hljs-bullet {

44− color: #008200;

36+.hljs-attribute,

37+.hljs-section,

38+.hljs-title {

39+ color:#fec418

4540}

46−

47−/* Blue */

48−.hljs-title,

49−.hljs-section {

50− color: #0030f2;

41+.hljs-addition,

42+.hljs-bullet,

43+.hljs-string,

44+.hljs-symbol {

45+ color:#48b685

5146}

52−

53−/* Purple */

5447.hljs-keyword,

5548.hljs-selector-tag {

56− color: #9d00ec;

57−}

58−

59−.hljs {

60− display: block;

61− overflow-x: auto;

62− background: #f6f7f6;

63− color: #000;

64− padding: 0.5em;

49+ color:#815ba4

6550}

66−

6751.hljs-emphasis {

68− font-style: italic;

52+ font-style:italic

6953}

70−

7154.hljs-strong {

72− font-weight: bold;

73−}

74−

75−.hljs-addition {

76− color: #22863a;

77− background-color: #f0fff4;

78−}

79−

80−.hljs-deletion {

81− color: #b31d28;

82− background-color: #ffeef0;

55+ font-weight:700

8356}

runtime/queries/ocaml/highlights.scm+1−1

@@ -60,7 +60,7 @@

6060

6161[(number) (signed_number)] @number

6262

63−(character) @constant.builtin.character

63+(character) @constant.character

6464

6565(string) @string

6666

runtime/queries/rust/highlights.scm+1−1

@@ -149,7 +149,7 @@

149149

150150(mutable_specifier) @keyword.mut

151151

152−

152+; TODO: variable.mut to highlight mutable identifiers via locals.scm

153153

154154; -------

155155; Guess Other Types

runtime/themes/dark_plus.toml+1

@@ -34,6 +34,7 @@

3434"comment" = { fg = "#6A9955" }

3535

3636"string" = { fg = "#ce9178" }

37+"string.regexp" = { fg = "regex" }

3738"number" = { fg = "#b5cea8" }

3839"escape" = { fg = "#d7ba7d" }

3940

runtime/themes/monokai.toml+1

@@ -34,6 +34,7 @@

3434"comment" = { fg = "#88846F" }

3535

3636"string" = { fg = "#e6db74" }

37+"string.regexp" = { fg = "regex" }

3738"number" = { fg = "#ae81ff" }

3839"escape" = { fg = "#ae81ff" }

3940

theme.toml+1−3

@@ -28,9 +28,7 @@ escape = "honey"

2828label = "honey"

2929

3030# TODO: diferentiate doc comment

31−# concat (ERROR) @syntax-error and "MISSING ;" selectors for errors

32−

33−module = "#ff0000"

31+# concat (ERROR) @error.syntax and "MISSING ;" selectors for errors

3432

3533"ui.background" = { bg = "midnight" }

3634"ui.linenr" = { fg = "comet" }