@scalar/highlight 0.4.0 → 0.6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (61) hide show
  1. package/CHANGELOG.md +40 -0
  2. package/README.md +26 -8
  3. package/dist/all.d.ts.map +1 -1
  4. package/dist/all.js +2 -0
  5. package/dist/compat/hljs.d.ts.map +1 -1
  6. package/dist/compat/hljs.js +1 -0
  7. package/dist/compat/languages.d.ts.map +1 -1
  8. package/dist/compat/languages.js +1 -4
  9. package/dist/core/compile.d.ts.map +1 -1
  10. package/dist/core/compile.js +50 -5
  11. package/dist/core/registry.d.ts.map +1 -1
  12. package/dist/core/registry.js +11 -4
  13. package/dist/core/scopes.d.ts +3 -1
  14. package/dist/core/scopes.d.ts.map +1 -1
  15. package/dist/core/scopes.js +3 -1
  16. package/dist/core/tokenize.d.ts.map +1 -1
  17. package/dist/core/tokenize.js +5 -1
  18. package/dist/core/types.d.ts +3 -2
  19. package/dist/core/types.d.ts.map +1 -1
  20. package/dist/index.d.ts +1 -1
  21. package/dist/index.d.ts.map +1 -1
  22. package/dist/index.js +1 -1
  23. package/dist/langs/cpp.d.ts.map +1 -1
  24. package/dist/langs/cpp.js +8 -0
  25. package/dist/langs/csharp.d.ts.map +1 -1
  26. package/dist/langs/csharp.js +16 -11
  27. package/dist/langs/css.d.ts.map +1 -1
  28. package/dist/langs/css.js +27 -2
  29. package/dist/langs/curl.d.ts +4 -0
  30. package/dist/langs/curl.d.ts.map +1 -0
  31. package/dist/langs/curl.js +60 -0
  32. package/dist/langs/diff.d.ts +2 -1
  33. package/dist/langs/diff.d.ts.map +1 -1
  34. package/dist/langs/diff.js +19 -7
  35. package/dist/langs/go.d.ts.map +1 -1
  36. package/dist/langs/go.js +23 -0
  37. package/dist/langs/haskell.d.ts.map +1 -1
  38. package/dist/langs/haskell.js +33 -0
  39. package/dist/langs/java.d.ts.map +1 -1
  40. package/dist/langs/java.js +17 -10
  41. package/dist/langs/javascript.d.ts.map +1 -1
  42. package/dist/langs/javascript.js +149 -4
  43. package/dist/langs/kotlin.d.ts.map +1 -1
  44. package/dist/langs/kotlin.js +8 -1
  45. package/dist/langs/nginx.d.ts.map +1 -1
  46. package/dist/langs/nginx.js +26 -1
  47. package/dist/langs/powershell.d.ts.map +1 -1
  48. package/dist/langs/powershell.js +4 -1
  49. package/dist/langs/python.d.ts.map +1 -1
  50. package/dist/langs/python.js +9 -2
  51. package/dist/langs/ruby.d.ts.map +1 -1
  52. package/dist/langs/ruby.js +8 -7
  53. package/dist/langs/rust.d.ts.map +1 -1
  54. package/dist/langs/rust.js +15 -1
  55. package/dist/langs/swift.d.ts.map +1 -1
  56. package/dist/langs/swift.js +27 -1
  57. package/dist/lazy.d.ts +1 -0
  58. package/dist/lazy.d.ts.map +1 -1
  59. package/dist/lazy.js +1 -1
  60. package/dist/style.css +1 -0
  61. package/package.json +6 -6
@@ -47,11 +47,23 @@ const rust = {
47
47
  match: '(fn)(\\s+)([A-Za-z_]\\w*)',
48
48
  scope: ['keyword.declaration', null, 'function'],
49
49
  },
50
+ // `let client =` and `let mut count =` bind a name. A capitalised word
51
+ // after `let` is a pattern (`let Some(x) =`), so it is left to the
52
+ // type rules.
53
+ {
54
+ match: '\\b(let)(\\s+)(?:(mut)(\\s+))?((?:r#)?[a-z_]\\w*)',
55
+ scope: ['keyword.declaration', null, 'keyword.declaration', null, 'variable'],
56
+ },
50
57
  {
51
58
  match: '\\b(?:fn|let|const|static|struct|enum|trait|impl|type|mod|union|async|move|dyn|pub|crate|unsafe|extern|ref|mut|where)\\b',
52
59
  scope: 'keyword.declaration',
53
60
  },
54
- { match: '\\b(?:use|as|super|self|Self)\\b', scope: 'keyword.import' },
61
+ // `r#type` is an identifier spelled like a keyword; claiming it here,
62
+ // where it starts, keeps the keyword rules from matching its tail.
63
+ { match: 'r#[A-Za-z_]\\w*' },
64
+ { match: '\\b(?:use|as|super)\\b', scope: 'keyword.import' },
65
+ { match: '\\bself\\b', scope: 'variable.builtin' },
66
+ { match: '\\bSelf\\b', scope: 'type' },
55
67
  { match: '\\b(?:in|box)\\b', scope: 'keyword.operator' },
56
68
  { match: '\\b(?:true|false)\\b', scope: 'boolean' },
57
69
  { match: '\\b(?:None|Some|Ok|Err)\\b', scope: 'constant.builtin' },
@@ -66,6 +78,8 @@ const rust = {
66
78
  match: '\\b([A-Za-z_]\\w*)(!)',
67
79
  scope: ['function.builtin', 'function.builtin'],
68
80
  },
81
+ // `.await` is a keyword in field position, not a member.
82
+ { match: '(\\.)(await)\\b', scope: ['punctuation', 'keyword.control'] },
69
83
  {
70
84
  match: '(\\.)([A-Za-z_]\\w*)(?=\\s*\\()',
71
85
  scope: ['punctuation', 'function.method'],
@@ -1 +1 @@
1
- {"version":3,"file":"swift.d.ts","sourceRoot":"","sources":["../../src/langs/swift.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAE5C;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,QAAA,MAAM,KAAK,EAAE,OAwPZ,CAAA;AAED,eAAe,KAAK,CAAA"}
1
+ {"version":3,"file":"swift.d.ts","sourceRoot":"","sources":["../../src/langs/swift.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAE5C;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,QAAA,MAAM,KAAK,EAAE,OAmRZ,CAAA;AAED,eAAe,KAAK,CAAA"}
@@ -35,6 +35,7 @@ const swift = {
35
35
  rules: [
36
36
  { include: 'comments' },
37
37
  { include: 'strings' },
38
+ { include: 'regex' },
38
39
  // `@escaping`, `@MainActor`, `@available(iOS 15, *)`. The argument list
39
40
  // is deliberately left as ordinary code so `iOS 15` still reads as one.
40
41
  { match: '@[A-Za-z_]\\w*', scope: 'decorator' },
@@ -72,7 +73,7 @@ const swift = {
72
73
  scope: 'keyword.control',
73
74
  },
74
75
  {
75
- match: '\\b(?:func|var|let|class|struct|enum|protocol|extension|actor|init|deinit|subscript|typealias|associatedtype|operator|precedencegroup|static|final|lazy|weak|unowned|mutating|nonmutating|override|open|public|internal|fileprivate|private|package|required|convenience|indirect|inout|dynamic|async|throws|rethrows|some|any|get|set|willSet|didSet)\\b',
76
+ match: '\\b(?:func|var|let|class|struct|enum|protocol|extension|actor|init|deinit|subscript|typealias|associatedtype|operator|precedencegroup|static|final|lazy|weak|unowned|mutating|nonmutating|override|open|public|internal|fileprivate|private|package|required|convenience|indirect|inout|dynamic|async|throws|rethrows|some|any|get|set|willSet|didSet|nonisolated|isolated|distributed|borrowing|consuming|sending|macro)\\b',
76
77
  scope: 'keyword.declaration',
77
78
  },
78
79
  { match: '\\b(?:is|as|in)\\b', scope: 'keyword.operator' },
@@ -176,6 +177,31 @@ const swift = {
176
177
  { match: '"', scope: 'string', push: 'string' },
177
178
  ],
178
179
  },
180
+ // ---- regex literals ------------------------------------------------------
181
+ regex: {
182
+ rules: [
183
+ // `#/…/#` can span lines and holds a bare `/`; only the `/` followed by
184
+ // as many `#` as opened it closes the literal.
185
+ // Only try at the start of a hash run; retrying each suffix is quadratic
186
+ // when a pasted or incomplete run has no opening slash.
187
+ { match: '(?<!#)(#+)/', scope: 'regexp', push: 'regex-extended', remember: 1 },
188
+ // A bare `/…/` is a regex only where an expression starts, and never
189
+ // with a space just inside either slash, which is how Swift itself
190
+ // tells it apart from division. The lookbehind sits after the `/` so the
191
+ // rule still starts with a literal character.
192
+ {
193
+ match: '/(?<=(?:[=(,:\\[!&|?{]|\\breturn|\\bcase)[ \\t]*/)(?![\\s/*])(?:[^/\\\\\\n]|\\\\.)+(?<!\\s)/',
194
+ scope: 'regexp',
195
+ },
196
+ ],
197
+ },
198
+ 'regex-extended': {
199
+ default: 'regexp',
200
+ rules: [
201
+ { match: '\\\\.', scope: 'regexp' },
202
+ { match: '/{{remembered}}', scope: 'regexp', pop: true },
203
+ ],
204
+ },
179
205
  /** Escape and interpolation rules shared by both ordinary string states. */
180
206
  'string-body': {
181
207
  rules: [
package/dist/lazy.d.ts CHANGED
@@ -17,6 +17,7 @@ declare const loaders: {
17
17
  cpp: () => Promise<typeof import("./langs/cpp.js")>;
18
18
  csharp: () => Promise<typeof import("./langs/csharp.js")>;
19
19
  css: () => Promise<typeof import("./langs/css.js")>;
20
+ curl: () => Promise<typeof import("./langs/curl.js")>;
20
21
  dart: () => Promise<typeof import("./langs/dart.js")>;
21
22
  diff: () => Promise<typeof import("./langs/diff.js")>;
22
23
  dockerfile: () => Promise<typeof import("./langs/dockerfile.js")>;
@@ -1 +1 @@
1
- {"version":3,"file":"lazy.d.ts","sourceRoot":"","sources":["../src/lazy.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAEnD;;;;;;;;;;GAUG;AACH,QAAA,MAAM,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA0CkD,CAAA;AAE/D,MAAM,MAAM,eAAe,GAAG,MAAM,OAAO,OAAO,CAAA;AAsGlD,eAAO,MAAM,gBAAgB,EAA2B,eAAe,EAAE,CAAA;AAEzE,sEAAsE;AACtE,eAAO,MAAM,mBAAmB,GAAI,MAAM,MAAM,KAAG,eAAe,GAAG,SASpE,CAAA;AAID;;;;;GAKG;AACH,eAAO,MAAM,YAAY,GAAI,MAAM,MAAM,KAAG,OAAO,CAAC,eAAe,CA4BlE,CAAA;AAED,uCAAuC;AACvC,eAAO,MAAM,aAAa,GAAI,GAAG,OAAO,MAAM,EAAE,KAAG,OAAO,CAAC,eAAe,EAAE,CAE3E,CAAA"}
1
+ {"version":3,"file":"lazy.d.ts","sourceRoot":"","sources":["../src/lazy.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAEnD;;;;;;;;;;GAUG;AACH,QAAA,MAAM,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2CkD,CAAA;AAE/D,MAAM,MAAM,eAAe,GAAG,MAAM,OAAO,OAAO,CAAA;AAqGlD,eAAO,MAAM,gBAAgB,EAA2B,eAAe,EAAE,CAAA;AAEzE,sEAAsE;AACtE,eAAO,MAAM,mBAAmB,GAAI,MAAM,MAAM,KAAG,eAAe,GAAG,SASpE,CAAA;AAID;;;;;GAKG;AACH,eAAO,MAAM,YAAY,GAAI,MAAM,MAAM,KAAG,OAAO,CAAC,eAAe,CA4BlE,CAAA;AAED,uCAAuC;AACvC,eAAO,MAAM,aAAa,GAAI,GAAG,OAAO,MAAM,EAAE,KAAG,OAAO,CAAC,eAAe,EAAE,CAE3E,CAAA"}
package/dist/lazy.js CHANGED
@@ -17,6 +17,7 @@ const loaders = {
17
17
  cpp: () => import('./langs/cpp.js'),
18
18
  csharp: () => import('./langs/csharp.js'),
19
19
  css: () => import('./langs/css.js'),
20
+ curl: () => import('./langs/curl.js'),
20
21
  dart: () => import('./langs/dart.js'),
21
22
  diff: () => import('./langs/diff.js'),
22
23
  dockerfile: () => import('./langs/dockerfile.js'),
@@ -72,7 +73,6 @@ const aliases = {
72
73
  containerfile: 'dockerfile',
73
74
  cppm: 'cpp',
74
75
  cs: 'csharp',
75
- curl: 'bash',
76
76
  cxx: 'cpp',
77
77
  docker: 'dockerfile',
78
78
  edn: 'clojure',
package/dist/style.css CHANGED
@@ -258,6 +258,7 @@
258
258
  }
259
259
 
260
260
  .shl-code .shl-fb,
261
+ .shl-code .shl-sy,
261
262
  .shl-code .shl-o {
262
263
  color: var(--scalar-hl-builtin);
263
264
  }
package/package.json CHANGED
@@ -16,7 +16,7 @@
16
16
  "code",
17
17
  "performance"
18
18
  ],
19
- "version": "0.4.0",
19
+ "version": "0.6.0",
20
20
  "engines": {
21
21
  "node": ">=22"
22
22
  },
@@ -69,13 +69,13 @@
69
69
  "**/*.css"
70
70
  ],
71
71
  "dependencies": {
72
- "@types/hast": "^3.0.4"
72
+ "@types/hast": "^3.0.5"
73
73
  },
74
74
  "devDependencies": {
75
- "@scalar/code-highlight": "0.4.10",
76
- "highlight.js": "^11.11.1",
77
- "rolldown": "1.1.5",
78
- "vitest": "4.1.10"
75
+ "@scalar/code-highlight": "0.4.11",
76
+ "highlight.js": "^11.12.0",
77
+ "rolldown": "1.2.14",
78
+ "vitest": "4.1.12"
79
79
  },
80
80
  "scripts": {
81
81
  "bench": "tsx bench/bench.ts",