@fsegurai/codemirror-theme-nord 6.2.7 → 6.3.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 (4) hide show
  1. package/README.md +40 -32
  2. package/dist/index.cjs +663 -390
  3. package/dist/index.js +663 -390
  4. package/package.json +1 -1
package/dist/index.cjs CHANGED
@@ -10,9 +10,6 @@ const generalContent = {
10
10
  fontFamily: 'JetBrains Mono, Consolas, monospace',
11
11
  lineHeight: '1.6',
12
12
  };
13
- const generalCursor = {
14
- borderLeftWidth: '2px',
15
- };
16
13
  const generalDiff = {
17
14
  insertedTextDecoration: 'none',
18
15
  deletedTextDecoration: 'line-through',
@@ -22,11 +19,9 @@ const generalGutter = {
22
19
  border: 'none',
23
20
  paddingRight: '8px',
24
21
  fontSize: '0.9em',
25
- fontWeight: '500',
26
22
  lineHeight: '1.78', // Adjusted to compensate for 0.9em fontSize (1.6 / 0.9 ≈ 1.78)
27
23
  };
28
24
  const generalPanel = {
29
- border: 'none',
30
25
  borderRadius: '4px',
31
26
  padding: '2px 10px',
32
27
  };
@@ -106,6 +101,498 @@ function applyMergeRevertStyles(styles) {
106
101
  document.head.appendChild(styleEl);
107
102
  }
108
103
 
104
+ // Shared theme core: every theme package describes a palette (`ThemeDefinition`) and this module turns it into the
105
+ // CodeMirror extension. Generated into each package by `bun run generate:helpers`; edit only the copy in
106
+ // `packages/.helper/utils/`.
107
+ /** Parent of every fine role: an omitted fine role resolves to its parent. */
108
+ const ROLE_PARENTS = {
109
+ controlKeyword: 'keyword',
110
+ moduleKeyword: 'keyword',
111
+ definitionKeyword: 'keyword',
112
+ operatorKeyword: 'operator',
113
+ modifier: 'keyword',
114
+ arithmeticOperator: 'operator',
115
+ logicOperator: 'operator',
116
+ compareOperator: 'operator',
117
+ bitwiseOperator: 'operator',
118
+ updateOperator: 'operator',
119
+ derefOperator: 'operator',
120
+ definitionOperator: 'operator',
121
+ typeOperator: 'operator',
122
+ controlOperator: 'operator',
123
+ separator: 'punctuation',
124
+ bracket: 'punctuation',
125
+ paren: 'bracket',
126
+ brace: 'bracket',
127
+ squareBracket: 'bracket',
128
+ angleBracket: 'bracket',
129
+ character: 'name',
130
+ macroName: 'name',
131
+ variable: 'name',
132
+ localVariable: 'variable',
133
+ variableDefinition: 'variable',
134
+ nameDefinition: 'variableDefinition',
135
+ functionDefinition: 'function',
136
+ self: 'variable',
137
+ label: 'name',
138
+ propertyDefinition: 'property',
139
+ method: 'property',
140
+ methodDefinition: 'method',
141
+ specialProperty: 'property',
142
+ typeDefinition: 'type',
143
+ className: 'type',
144
+ namespace: 'type',
145
+ standardTag: 'tag',
146
+ annotation: 'meta',
147
+ documentMeta: 'meta',
148
+ processingInstruction: 'meta',
149
+ attributeValue: 'string',
150
+ literal: 'string',
151
+ docString: 'string',
152
+ regexp: 'string',
153
+ specialString: 'regexp',
154
+ escape: 'string',
155
+ unit: 'number',
156
+ atom: 'constant',
157
+ bool: 'atom',
158
+ null: 'constant',
159
+ constantName: 'constant',
160
+ standardName: 'constant',
161
+ color: 'standardName',
162
+ specialVariable: 'constant',
163
+ docComment: 'comment',
164
+ headingLevel: 'heading',
165
+ heading1: 'headingLevel',
166
+ heading2: 'headingLevel',
167
+ heading3: 'headingLevel',
168
+ heading4: 'headingLevel',
169
+ heading5: 'headingLevel',
170
+ heading6: 'headingLevel',
171
+ list: 'name',
172
+ quote: 'string',
173
+ monospace: 'string',
174
+ contentSeparator: 'punctuation',
175
+ };
176
+ /**
177
+ * Canonical tag → role table shared by every theme: every Lezer base tag and the modifier combinations that the
178
+ * official grammars emit. Each tag appears once, so no rule is shadowed by a later one.
179
+ */
180
+ const SYNTAX_TAGS = [
181
+ ['keyword', [highlight.tags.keyword]],
182
+ ['controlKeyword', [highlight.tags.controlKeyword]],
183
+ ['moduleKeyword', [highlight.tags.moduleKeyword]],
184
+ ['definitionKeyword', [highlight.tags.definitionKeyword]],
185
+ ['operatorKeyword', [highlight.tags.operatorKeyword]],
186
+ ['modifier', [highlight.tags.modifier]],
187
+ ['operator', [highlight.tags.operator]],
188
+ ['arithmeticOperator', [highlight.tags.arithmeticOperator]],
189
+ ['logicOperator', [highlight.tags.logicOperator]],
190
+ ['compareOperator', [highlight.tags.compareOperator]],
191
+ ['bitwiseOperator', [highlight.tags.bitwiseOperator]],
192
+ ['updateOperator', [highlight.tags.updateOperator]],
193
+ ['derefOperator', [highlight.tags.derefOperator]],
194
+ ['definitionOperator', [highlight.tags.definitionOperator]],
195
+ ['typeOperator', [highlight.tags.typeOperator]],
196
+ ['controlOperator', [highlight.tags.controlOperator]],
197
+ ['punctuation', [highlight.tags.punctuation, highlight.tags.function(highlight.tags.punctuation)]],
198
+ ['separator', [highlight.tags.separator]],
199
+ ['bracket', [highlight.tags.bracket]],
200
+ ['paren', [highlight.tags.paren]],
201
+ ['brace', [highlight.tags.brace, highlight.tags.special(highlight.tags.brace)]],
202
+ ['squareBracket', [highlight.tags.squareBracket]],
203
+ ['angleBracket', [highlight.tags.angleBracket]],
204
+ ['name', [highlight.tags.name, highlight.tags.special(highlight.tags.name)]],
205
+ ['character', [highlight.tags.character]],
206
+ ['macroName', [highlight.tags.macroName]],
207
+ ['variable', [highlight.tags.variableName, highlight.tags.standard(highlight.tags.variableName)]],
208
+ ['localVariable', [highlight.tags.local(highlight.tags.variableName)]],
209
+ ['variableDefinition', [highlight.tags.definition(highlight.tags.variableName)]],
210
+ ['nameDefinition', [highlight.tags.definition(highlight.tags.name)]],
211
+ ['function', [highlight.tags.function(highlight.tags.variableName)]],
212
+ ['functionDefinition', [highlight.tags.definition(highlight.tags.function(highlight.tags.variableName))]],
213
+ ['self', [highlight.tags.self]],
214
+ ['label', [highlight.tags.labelName]],
215
+ ['property', [highlight.tags.propertyName]],
216
+ ['propertyDefinition', [highlight.tags.definition(highlight.tags.propertyName)]],
217
+ ['method', [highlight.tags.function(highlight.tags.propertyName)]],
218
+ ['methodDefinition', [highlight.tags.definition(highlight.tags.function(highlight.tags.propertyName))]],
219
+ ['specialProperty', [highlight.tags.special(highlight.tags.propertyName), highlight.tags.definition(highlight.tags.special(highlight.tags.propertyName))]],
220
+ ['type', [highlight.tags.typeName, highlight.tags.standard(highlight.tags.typeName)]],
221
+ ['typeDefinition', [highlight.tags.definition(highlight.tags.typeName)]],
222
+ ['className', [highlight.tags.className, highlight.tags.definition(highlight.tags.className), highlight.tags.constant(highlight.tags.className)]],
223
+ ['namespace', [highlight.tags.namespace]],
224
+ ['tag', [highlight.tags.tagName]],
225
+ ['standardTag', [highlight.tags.standard(highlight.tags.tagName)]],
226
+ ['attribute', [highlight.tags.attributeName, highlight.tags.special(highlight.tags.attributeName)]],
227
+ ['attributeValue', [highlight.tags.attributeValue]],
228
+ ['literal', [highlight.tags.literal]],
229
+ ['string', [highlight.tags.string]],
230
+ ['docString', [highlight.tags.docString]],
231
+ ['regexp', [highlight.tags.regexp]],
232
+ ['specialString', [highlight.tags.special(highlight.tags.string), highlight.tags.special(highlight.tags.docString)]],
233
+ ['escape', [highlight.tags.escape]],
234
+ ['number', [highlight.tags.number, highlight.tags.integer, highlight.tags.float]],
235
+ ['unit', [highlight.tags.unit]],
236
+ ['atom', [highlight.tags.atom]],
237
+ ['bool', [highlight.tags.bool]],
238
+ ['null', [highlight.tags.null]],
239
+ ['constantName', [highlight.tags.constant(highlight.tags.name)]],
240
+ ['standardName', [highlight.tags.standard(highlight.tags.name)]],
241
+ ['color', [highlight.tags.color]],
242
+ ['specialVariable', [highlight.tags.special(highlight.tags.variableName)]],
243
+ ['comment', [highlight.tags.comment, highlight.tags.lineComment, highlight.tags.blockComment]],
244
+ ['docComment', [highlight.tags.docComment]],
245
+ ['meta', [highlight.tags.meta]],
246
+ ['documentMeta', [highlight.tags.documentMeta]],
247
+ ['processingInstruction', [highlight.tags.processingInstruction]],
248
+ ['annotation', [highlight.tags.annotation]],
249
+ ['content', [highlight.tags.content, highlight.tags.special(highlight.tags.content)]],
250
+ ['heading', [highlight.tags.heading]],
251
+ ['heading1', [highlight.tags.heading1]],
252
+ ['heading2', [highlight.tags.heading2]],
253
+ ['heading3', [highlight.tags.heading3]],
254
+ ['heading4', [highlight.tags.heading4]],
255
+ ['heading5', [highlight.tags.heading5]],
256
+ ['heading6', [highlight.tags.heading6]],
257
+ ['list', [highlight.tags.list]],
258
+ ['quote', [highlight.tags.quote]],
259
+ ['monospace', [highlight.tags.monospace]],
260
+ ['contentSeparator', [highlight.tags.contentSeparator]],
261
+ ['link', [highlight.tags.link]],
262
+ ['url', [highlight.tags.url]],
263
+ ['emphasis', [highlight.tags.emphasis]],
264
+ ['strong', [highlight.tags.strong]],
265
+ ['strikethrough', [highlight.tags.strikethrough]],
266
+ ['invalid', [highlight.tags.invalid]],
267
+ ['inserted', [highlight.tags.inserted]],
268
+ ['deleted', [highlight.tags.deleted]],
269
+ ['changed', [highlight.tags.changed]],
270
+ ];
271
+ /** Inline SVG image (same encoding as `@codemirror/lint`), used to draw lint markers in the theme colors. */
272
+ function svg(content, attrs = 'viewBox="0 0 40 40"') {
273
+ return `url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" ${attrs}>${encodeURIComponent(content)}</svg>')`;
274
+ }
275
+ /** Wavy underline of a lint range. */
276
+ function lintUnderline(color) {
277
+ return svg(`<path d="m0 2.5 l2 -1.5 l1 0 l2 1.5 l1 0" stroke="${color}" fill="none" stroke-width=".7"/>`, 'width="6" height="3"');
278
+ }
279
+ /**
280
+ * Canonical UI template: the same selectors for every theme, only palette values differ. Rules of equal specificity
281
+ * keep the order of the original theme files (later rules win).
282
+ */
283
+ function uiTemplate(ui) {
284
+ return {
285
+ '&': {
286
+ color: ui.foreground,
287
+ backgroundColor: ui.background,
288
+ border: ui.border,
289
+ fontSize: generalContent.fontSize,
290
+ fontFamily: generalContent.fontFamily,
291
+ },
292
+ '.cm-content': { caretColor: ui.cursor, lineHeight: generalContent.lineHeight },
293
+ '.cm-cursor, .cm-dropCursor': {
294
+ borderLeftColor: ui.cursor,
295
+ borderLeftWidth: ui.cursorWidth,
296
+ boxShadow: ui.cursorShadow,
297
+ },
298
+ '.cm-cursor-secondary': { borderLeftColor: ui.cursor, opacity: '0.6' },
299
+ '.cm-fat-cursor': {
300
+ backgroundColor: ui.fatCursor.background,
301
+ color: ui.background,
302
+ border: ui.fatCursor.border,
303
+ boxShadow: ui.cursorShadow,
304
+ },
305
+ '&.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection': { backgroundColor: ui.selection, color: ui.selectionForeground, outline: ui.selectionOutline },
306
+ '&:not(.cm-focused) .cm-selectionBackground': { backgroundColor: ui.selectionInactive },
307
+ '.cm-selectionLayer': { zIndex: 100 },
308
+ '.cm-searchMatch': {
309
+ backgroundColor: ui.searchMatch.background,
310
+ outline: `${ui.outlineWidth} solid ${ui.searchMatch.outline}`,
311
+ color: ui.searchMatch.foreground,
312
+ borderRadius: generalSearchField.borderRadius,
313
+ boxShadow: ui.searchMatch.shadow,
314
+ },
315
+ '.cm-searchMatch span': { color: ui.searchMatch.foreground },
316
+ '.cm-searchMatch.cm-searchMatch-selected': {
317
+ backgroundColor: ui.searchMatch.selectedBackground,
318
+ color: ui.searchMatch.selectedForeground,
319
+ padding: generalSearchField.padding,
320
+ outline: ui.searchMatch.selectedOutline,
321
+ boxShadow: ui.searchMatch.selectedShadow,
322
+ },
323
+ '.cm-searchMatch.cm-searchMatch-selected span': { color: ui.searchMatch.selectedForeground },
324
+ '.cm-search.cm-panel.cm-textfield': {
325
+ color: ui.panel.foreground,
326
+ borderRadius: generalSearchField.borderRadius,
327
+ padding: generalSearchField.padding,
328
+ },
329
+ '.cm-textfield': {
330
+ backgroundColor: ui.panel.inputBackground,
331
+ color: ui.panel.foreground,
332
+ border: ui.panel.inputBorder,
333
+ borderRadius: generalSearchField.borderRadius,
334
+ padding: generalSearchField.padding,
335
+ },
336
+ '.cm-panels': {
337
+ backgroundColor: ui.panel.background,
338
+ color: ui.panel.foreground,
339
+ border: ui.panel.outline,
340
+ borderRadius: generalPanel.borderRadius,
341
+ boxShadow: ui.panel.shadow,
342
+ },
343
+ '.cm-panels.cm-panels-top': { borderBottom: `${ui.panel.borderWidth} solid ${ui.panel.border}` },
344
+ '.cm-panels.cm-panels-bottom': { borderTop: `${ui.panel.borderWidth} solid ${ui.panel.border}` },
345
+ '.cm-panel.cm-gotoLine': { color: ui.panel.foreground, padding: generalPanel.padding },
346
+ '.cm-panel button, .cm-button': {
347
+ backgroundColor: ui.panel.buttonBackground,
348
+ backgroundImage: 'none',
349
+ color: ui.panel.buttonForeground,
350
+ border: ui.panel.buttonBorder,
351
+ borderRadius: generalPanel.borderRadius,
352
+ padding: generalPanel.padding,
353
+ },
354
+ '.cm-panel button:hover, .cm-button:hover': {
355
+ backgroundColor: ui.panel.buttonHoverBackground,
356
+ color: ui.panel.buttonHoverForeground,
357
+ border: ui.panel.buttonHoverBorder,
358
+ boxShadow: ui.panel.buttonHoverShadow,
359
+ },
360
+ '.cm-activeLine': {
361
+ backgroundColor: ui.activeLine,
362
+ borderLeft: ui.activeLineBorder.left,
363
+ borderRight: ui.activeLineBorder.right,
364
+ borderRadius: generalLine.borderRadius,
365
+ zIndex: 1,
366
+ },
367
+ '.cm-gutters': {
368
+ backgroundColor: ui.gutter.background,
369
+ color: ui.gutter.foreground,
370
+ border: generalGutter.border,
371
+ borderRight: `${ui.outlineWidth} solid ${ui.gutter.border}`,
372
+ paddingRight: generalGutter.paddingRight,
373
+ },
374
+ '.cm-activeLineGutter': {
375
+ backgroundColor: ui.gutter.activeBackground,
376
+ color: ui.gutter.activeForeground,
377
+ fontWeight: ui.gutter.activeFontWeight,
378
+ border: ui.gutter.activeBorder,
379
+ },
380
+ '.cm-lineNumbers': { fontSize: generalGutter.fontSize, lineHeight: generalGutter.lineHeight },
381
+ '.cm-foldGutter': { fontSize: generalGutter.fontSize, lineHeight: generalGutter.lineHeight },
382
+ '.cm-foldGutter .cm-gutterElement': { color: ui.gutter.foreground, cursor: 'pointer' },
383
+ '.cm-foldGutter .cm-gutterElement:hover': { color: ui.gutter.foldHover },
384
+ '.cm-gutter-lint': { color: ui.gutter.foreground },
385
+ '.cm-lint-marker': { width: '1em', height: '1em' },
386
+ '.cm-lint-marker-error': {
387
+ content: svg(`<circle cx="20" cy="20" r="15" fill="${ui.diagnostic.error}" stroke="${ui.background}" stroke-width="4"/>`),
388
+ },
389
+ '.cm-lint-marker-warning': {
390
+ content: svg(`<path fill="${ui.diagnostic.warning}" stroke="${ui.background}" stroke-width="4" stroke-linejoin="round" d="M20 6L37 35L3 35Z"/>`),
391
+ },
392
+ '.cm-lint-marker-info': {
393
+ content: svg(`<path fill="${ui.diagnostic.info}" stroke="${ui.background}" stroke-width="4" stroke-linejoin="round" d="M5 5L35 5L35 35L5 35Z"/>`),
394
+ },
395
+ '.cm-changeGutter': { backgroundColor: ui.gutter.background },
396
+ '.cm-merge-b .cm-changedLineGutter, .cm-inlineChangedLineGutter': { background: ui.diff.insertedForeground },
397
+ '.cm-merge-a .cm-changedLineGutter, .cm-deletedLineGutter': { background: ui.diff.deletedForeground },
398
+ '.cm-insertedLine': {
399
+ textDecoration: generalDiff.insertedTextDecoration,
400
+ backgroundColor: ui.diff.insertedBackground,
401
+ color: ui.diff.insertedForeground,
402
+ padding: generalDiff.insertedLinePadding,
403
+ borderRadius: generalDiff.borderRadius,
404
+ },
405
+ 'ins.cm-insertedLine, ins.cm-insertedLine:not(:has(.cm-changedText))': {
406
+ textDecoration: generalDiff.insertedTextDecoration,
407
+ backgroundColor: `${ui.diff.insertedBackground} !important`,
408
+ color: ui.diff.insertedForeground,
409
+ padding: generalDiff.insertedLinePadding,
410
+ borderRadius: generalDiff.borderRadius,
411
+ border: ui.diff.insertedBorder,
412
+ },
413
+ 'ins.cm-insertedLine .cm-changedText': { background: 'transparent !important' },
414
+ '.cm-deletedLine': {
415
+ textDecoration: generalDiff.deletedTextDecoration,
416
+ backgroundColor: ui.diff.deletedBackground,
417
+ color: ui.diff.deletedForeground,
418
+ padding: generalDiff.insertedLinePadding,
419
+ borderRadius: generalDiff.borderRadius,
420
+ },
421
+ // Merge view deletions only: `del` decorations, inline deletion widgets and the lines of deleted chunks. `:where()`
422
+ // keeps the specificity of the former bare `del` selector without styling other `del` elements.
423
+ 'del.cm-deletedLine, del.cm-deletedText, :where(.cm-deletedChunk) del, :where(.cm-deletedChunk) del:not(:has(.cm-deletedText))': {
424
+ textDecoration: generalDiff.deletedTextDecoration,
425
+ backgroundColor: `${ui.diff.deletedBackground} !important`,
426
+ color: ui.diff.deletedForeground,
427
+ padding: generalDiff.insertedLinePadding,
428
+ borderRadius: generalDiff.borderRadius,
429
+ border: ui.diff.deletedBorder,
430
+ },
431
+ ':where(.cm-deletedChunk) del .cm-deletedText, :where(.cm-deletedChunk) del .cm-changedText, del:where(.cm-deletedLine) .cm-deletedText, del:where(.cm-deletedLine) .cm-changedText': { background: 'transparent !important' },
432
+ '.cm-merge-b .cm-changedLine, .cm-inlineChangedLine': { backgroundColor: ui.diff.insertedBackground },
433
+ '.cm-merge-a .cm-changedLine, .cm-deletedChunk': { backgroundColor: ui.diff.deletedBackground },
434
+ '.cm-collapsedLines': {
435
+ background: ui.foldPlaceholder.background,
436
+ color: ui.foldPlaceholder.foreground,
437
+ },
438
+ '.cm-mergeSpacer': { background: ui.merge.backgroundColor },
439
+ '.cm-tooltip': {
440
+ backgroundColor: ui.tooltip.background,
441
+ color: ui.tooltip.foreground,
442
+ border: `${ui.outlineWidth} solid ${ui.tooltip.border}`,
443
+ borderRadius: generalTooltip.borderRadius,
444
+ padding: generalTooltip.padding,
445
+ boxShadow: ui.tooltip.shadow,
446
+ },
447
+ '.cm-tooltip-autocomplete > ul': { backgroundColor: ui.tooltip.listBackground, border: ui.tooltip.listBorder },
448
+ '.cm-tooltip-autocomplete > ul > li': { padding: generalTooltip.padding, lineHeight: generalTooltip.lineHeight },
449
+ '.cm-tooltip-autocomplete > ul > li:hover': { backgroundColor: ui.tooltip.hoverBackground },
450
+ '.cm-tooltip-autocomplete > ul > li[aria-selected]': {
451
+ backgroundColor: ui.tooltip.selectedBackground,
452
+ color: ui.tooltip.selectedForeground,
453
+ border: ui.tooltip.selectedBorder,
454
+ borderRadius: generalTooltip.borderRadiusSelected,
455
+ },
456
+ '.cm-tooltip-autocomplete > ul > li > span.cm-completionIcon': {
457
+ color: ui.tooltip.icon,
458
+ paddingRight: generalTooltip.paddingRight,
459
+ },
460
+ '.cm-tooltip-autocomplete > ul > li > span.cm-completionDetail': { color: ui.tooltip.detail, fontStyle: 'italic' },
461
+ '.cm-completionMatchedText': {
462
+ color: 'inherit',
463
+ fontWeight: 'bold',
464
+ textDecoration: 'underline',
465
+ textDecorationColor: ui.matchingBracket.outline,
466
+ },
467
+ '.cm-completionInfo': {
468
+ backgroundColor: ui.tooltip.background,
469
+ color: ui.tooltip.foreground,
470
+ border: `${ui.outlineWidth} solid ${ui.tooltip.border}`,
471
+ padding: generalTooltip.padding,
472
+ },
473
+ '.cm-tooltip .cm-tooltip-arrow:before': { borderTopColor: 'transparent', borderBottomColor: 'transparent' },
474
+ '.cm-tooltip .cm-tooltip-arrow:after': {
475
+ borderTopColor: ui.tooltip.background,
476
+ borderBottomColor: ui.tooltip.background,
477
+ },
478
+ '.cm-tooltip-lint': { color: ui.tooltip.foreground, padding: '0' },
479
+ '.cm-tooltip-section:not(:first-child)': { borderTop: `1px solid ${ui.tooltip.border}` },
480
+ '.cm-diagnostic-error': {
481
+ borderLeft: `${ui.diagnostic.borderWidth} solid ${ui.diagnostic.error}`,
482
+ backgroundColor: ui.diagnostic.errorBackground,
483
+ },
484
+ '.cm-diagnostic-warning': {
485
+ borderLeft: `${ui.diagnostic.borderWidth} solid ${ui.diagnostic.warning}`,
486
+ backgroundColor: ui.diagnostic.warningBackground,
487
+ },
488
+ '.cm-diagnostic-info': {
489
+ borderLeft: `${ui.diagnostic.borderWidth} solid ${ui.diagnostic.info}`,
490
+ backgroundColor: ui.diagnostic.infoBackground,
491
+ },
492
+ '.cm-diagnostic-hint': { borderLeft: `${ui.diagnostic.borderWidth} solid ${ui.diagnostic.hint}` },
493
+ '.cm-diagnosticAction': {
494
+ backgroundColor: ui.panel.buttonBackground,
495
+ color: ui.panel.buttonForeground,
496
+ border: ui.panel.buttonBorder,
497
+ borderRadius: generalPanel.borderRadius,
498
+ },
499
+ '.cm-lintRange-error': { backgroundImage: lintUnderline(ui.diagnostic.error) },
500
+ '.cm-lintRange-warning': { backgroundImage: lintUnderline(ui.diagnostic.warning) },
501
+ '.cm-lintRange-info': { backgroundImage: lintUnderline(ui.diagnostic.info) },
502
+ '.cm-lintRange-hint': { backgroundImage: lintUnderline(ui.diagnostic.hint) },
503
+ '.cm-lintPoint-error': { borderBottom: `${ui.diagnostic.underlineWidth} wavy ${ui.diagnostic.error}` },
504
+ '.cm-lintPoint-warning': { borderBottom: `${ui.diagnostic.underlineWidth} wavy ${ui.diagnostic.warning}` },
505
+ '.cm-lintPoint-info': { borderBottom: `${ui.diagnostic.underlineWidth} wavy ${ui.diagnostic.info}` },
506
+ '.cm-matchingBracket': {
507
+ backgroundColor: ui.matchingBracket.background,
508
+ outline: `${ui.outlineWidth} solid ${ui.matchingBracket.outline}`,
509
+ borderRadius: generalMatching.borderRadius,
510
+ boxShadow: ui.matchingBracket.shadow,
511
+ },
512
+ '.cm-nonmatchingBracket': {
513
+ backgroundColor: ui.nonMatchingBracket.background,
514
+ outline: `${ui.outlineWidth} solid ${ui.nonMatchingBracket.outline}`,
515
+ borderRadius: generalMatching.borderRadius,
516
+ },
517
+ '.cm-selectionMatch': {
518
+ backgroundColor: ui.selectionMatch.background,
519
+ outline: `${ui.outlineWidth} solid ${ui.selectionMatch.outline}`,
520
+ borderRadius: generalMatching.borderRadius,
521
+ },
522
+ '.cm-snippetField': {
523
+ backgroundColor: ui.selectionMatch.background,
524
+ outline: `1px dashed ${ui.selectionMatch.outline}`,
525
+ borderRadius: generalMatching.borderRadius,
526
+ },
527
+ '.cm-snippetFieldPosition': { borderLeft: `1px dotted ${ui.cursor}` },
528
+ '.cm-foldPlaceholder': {
529
+ backgroundColor: ui.foldPlaceholder.background,
530
+ color: ui.foldPlaceholder.foreground,
531
+ border: `${ui.outlineWidth} ${ui.foldPlaceholder.borderStyle} ${ui.foldPlaceholder.border}`,
532
+ borderRadius: generalPlaceholder.borderRadius,
533
+ padding: generalPlaceholder.padding,
534
+ margin: generalPlaceholder.margin,
535
+ },
536
+ // Transparent outline: invisible normally, repainted with the system color in forced-colors mode (drops box-shadow).
537
+ '&.cm-focused': { outline: '2px solid transparent', boxShadow: ui.focusRing },
538
+ '& .cm-scroller::-webkit-scrollbar': { width: generalScroller.width, height: generalScroller.height },
539
+ '& .cm-scroller::-webkit-scrollbar-track': { background: ui.scrollbar.track, border: ui.scrollbar.trackBorder },
540
+ '& .cm-scroller::-webkit-scrollbar-thumb': {
541
+ backgroundColor: ui.scrollbar.thumb,
542
+ borderRadius: generalScroller.borderRadius,
543
+ border: ui.scrollbar.thumbBorder,
544
+ },
545
+ '& .cm-scroller::-webkit-scrollbar-thumb:hover': {
546
+ backgroundColor: ui.scrollbar.thumbHover,
547
+ boxShadow: ui.scrollbar.thumbHoverShadow,
548
+ },
549
+ '.cm-ghostText': { opacity: ui.ghostTextOpacity, color: ui.ghostText },
550
+ '.cm-placeholder': { color: ui.ghostText },
551
+ '.cm-specialChar': { color: ui.specialChar },
552
+ '.cm-trailingSpace': { backgroundColor: ui.diff.deletedBackground },
553
+ '.cm-highlightSpace': {
554
+ backgroundImage: `radial-gradient(circle at 50% 55%, ${ui.gutter.foreground} 20%, transparent 0)`,
555
+ },
556
+ '.cm-crosshair': { cursor: 'crosshair' },
557
+ };
558
+ }
559
+ /** Drops `null` declarations and selectors left without declarations. */
560
+ function emittedRules(spec) {
561
+ const result = {};
562
+ for (const [selector, declarations] of Object.entries(spec)) {
563
+ const emitted = Object.entries(declarations).filter((entry) => entry[1] !== null);
564
+ if (emitted.length > 0)
565
+ result[selector] = Object.fromEntries(emitted);
566
+ }
567
+ return result;
568
+ }
569
+ /** Style of a role, falling back through `ROLE_PARENTS` for omitted fine roles. */
570
+ function resolveRole(syntax, role) {
571
+ let current = role;
572
+ while (current) {
573
+ const style = syntax[current];
574
+ if (style)
575
+ return style;
576
+ current = ROLE_PARENTS[current];
577
+ }
578
+ return {};
579
+ }
580
+ /** Highlight rules of a theme: one rule per entry of the canonical table. */
581
+ function highlightRules(definition) {
582
+ return SYNTAX_TAGS.map(([role, tagList]) => (Object.assign({ tag: [...tagList] }, resolveRole(definition.syntax, role))));
583
+ }
584
+ /** Builds the editor theme, the syntax highlighting and the merge view styles of a theme definition. */
585
+ function defineTheme(definition) {
586
+ const theme = view.EditorView.theme(emittedRules(uiTemplate(definition.ui)), { dark: definition.dark });
587
+ const highlightStyle = language.HighlightStyle.define(highlightRules(definition));
588
+ return {
589
+ extension: [theme, language.syntaxHighlighting(highlightStyle)],
590
+ theme,
591
+ highlightStyle,
592
+ mergeStyles: Object.assign({}, definition.ui.merge),
593
+ };
594
+ }
595
+
109
596
  /**
110
597
  * Enhanced Nord theme color definitions
111
598
  * ------------------------------------
@@ -115,420 +602,206 @@ function applyMergeRevertStyles(styles) {
115
602
  const base00 = '#2e3440', // Background - deep navy blue
116
603
  base01 = '#3b4252', // Lighter background (popups, statuslines)
117
604
  base02 = '#434c5e', // Selection background
118
- base03 = '#4c566a', // Comments, invisibles
605
+ base03 = '#acb8cf', // Comments, invisibles
119
606
  // Snow Storm
120
607
  base04 = '#d8dee9', // Foreground - light blue-grey
121
608
  base05 = '#eceff4', // Light background
122
609
  // Frost
123
- base06 = '#8fbcbb', // Moss green - function names
610
+ base06 = '#92c0be', // Moss green - function names
124
611
  base07 = '#88c0d0', // Ice blue - classes, attributes
125
- base08 = '#81a1c1', // Water blue - methods
126
- base09 = '#5e81ac', // Deep blue - keywords
612
+ base08 = '#9abbdc', // Water blue - methods
613
+ base09 = '#96bbe9', // Deep blue - keywords
127
614
  // Aurora
128
- base0A = '#bf616a', // Red - errors, brackets
129
- base0B = '#d08770', // Orange - numbers, constants
615
+ base0A = '#fb9ea4', // Red - errors, brackets
616
+ base0B = '#f1a58d', // Orange - numbers, constants
130
617
  base0C = '#ebcb8b', // Yellow - types, classes
131
- base0D = '#a3be8c', // Green - strings
132
- base0E = '#b48ead'; // Purple - operators, special characters
618
+ base0D = '#a5c08e', // Green - strings
619
+ base0E = '#d3accc'; // Purple - operators, special characters
133
620
  // UI specific colors
134
621
  const invalid = '#d30102', // Bright red for errors
135
622
  darkBackground = '#252a33', // Darker background for panels
136
623
  highlightBackground = '#3b425277', // Active line highlight with opacity
137
- background = base00, // Main editor background
138
- tooltipBackground = base01, // Tooltip background
139
- selection = base02, // Selection background
140
624
  selectionMatch = '#4c566a80', // Selection match with opacity
141
- cursor = base04, // Cursor color
142
- activeBracketBg = '#4c566a55', // Active bracket background with opacity
143
- activeBracketBorder = base07, // Active bracket border - ice blue
144
- diagnosticWarning = base0C, // Warning color - yellow
145
- linkColor = base08, // Link color - water blue
146
- visitedLinkColor = base0E; // Visited link color - purple
625
+ activeBracketBg = '#4c566a55'; // Active bracket background with opacity
147
626
  // Diff/merge specific colors
148
627
  const addedBackground = '#3b4a3880', // Dark green with transparency for insertions
149
- removedBackground = '#4a393a80', // Dark red with transparency for deletions
150
- addedText = '#a3be8c', // Nord green for added text
151
- removedText = '#bf616a'; // Nord red for removed text
152
- /**
153
- * Enhanced editor theme styles for Nord
154
- */
155
- const nordTheme = view.EditorView.theme({
156
- // Base editor styles
157
- '&': {
158
- color: base04,
159
- backgroundColor: background,
160
- fontSize: generalContent.fontSize,
161
- fontFamily: generalContent.fontFamily,
162
- },
163
- // Content and cursor
164
- '.cm-content': {
165
- caretColor: cursor,
166
- lineHeight: generalContent.lineHeight,
167
- },
168
- '.cm-cursor, .cm-dropCursor': {
169
- borderLeftColor: cursor,
170
- borderLeftWidth: generalCursor.borderLeftWidth,
171
- },
172
- '.cm-fat-cursor': {
173
- backgroundColor: `${cursor}99`,
174
- color: background,
175
- },
176
- // Selection
177
- '&.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection': {
178
- backgroundColor: selection,
179
- },
180
- // Make sure selection appears above active line
181
- '.cm-selectionLayer': {
182
- zIndex: 100,
183
- },
184
- // Search functionality
185
- '.cm-searchMatch': {
186
- backgroundColor: '#5e81ac80',
187
- outline: `1px solid ${base06}`,
188
- color: base04,
189
- borderRadius: generalSearchField.borderRadius,
190
- '& span': {
191
- color: base04,
192
- },
193
- },
194
- '.cm-searchMatch.cm-searchMatch-selected': {
195
- backgroundColor: base08,
196
- color: base05,
197
- padding: generalSearchField.padding,
198
- '& span': {
199
- color: base05,
200
- },
201
- },
202
- '.cm-search.cm-panel.cm-textfield': {
203
- color: base04,
204
- borderRadius: generalSearchField.borderRadius,
205
- padding: generalSearchField.padding,
206
- },
207
- // Panels
208
- '.cm-panels': {
209
- backgroundColor: darkBackground,
210
- color: base04,
211
- borderRadius: '4px',
212
- },
213
- '.cm-panels.cm-panels-top': {
214
- borderBottom: `1px solid ${base03}`,
215
- },
216
- '.cm-panels.cm-panels-bottom': {
217
- borderTop: `1px solid ${base03}`,
218
- },
219
- '.cm-panel button': {
220
- backgroundColor: tooltipBackground,
221
- color: base04,
222
- border: generalPanel.border,
223
- borderRadius: generalPanel.borderRadius,
224
- padding: generalPanel.padding,
225
- },
226
- '.cm-panel button:hover': {
227
- backgroundColor: base02,
228
- },
229
- // Line highlighting
230
- '.cm-activeLine': {
231
- backgroundColor: highlightBackground,
232
- borderRadius: generalLine.borderRadius,
233
- zIndex: 1,
234
- },
235
- // Gutters
236
- '.cm-gutters': {
237
- backgroundColor: darkBackground,
238
- color: base03,
239
- border: generalGutter.border,
240
- borderRight: `1px solid ${base02}`,
241
- paddingRight: generalGutter.paddingRight,
242
- },
243
- '.cm-activeLineGutter': {
244
- backgroundColor: base01,
245
- color: base04,
246
- fontWeight: generalGutter.fontWeight,
247
- },
248
- '.cm-lineNumbers': {
249
- fontSize: generalGutter.fontSize,
250
- lineHeight: generalGutter.lineHeight,
251
- },
252
- '.cm-foldGutter': {
253
- fontSize: generalGutter.fontSize,
254
- lineHeight: generalGutter.lineHeight,
255
- },
256
- '.cm-foldGutter .cm-gutterElement': {
257
- color: base03,
258
- cursor: 'pointer',
259
- },
260
- '.cm-foldGutter .cm-gutterElement:hover': {
261
- color: base04,
262
- },
263
- // Diff/Merge View Styles
264
- // Inserted/Added Content
265
- '.cm-insertedLine': {
266
- textDecoration: generalDiff.insertedTextDecoration,
267
- backgroundColor: addedBackground,
268
- color: addedText,
269
- padding: generalDiff.insertedLinePadding,
270
- borderRadius: generalDiff.borderRadius,
271
- },
272
- 'ins.cm-insertedLine, ins.cm-insertedLine:not(:has(.cm-changedText))': {
273
- textDecoration: generalDiff.insertedTextDecoration,
274
- backgroundColor: `${addedBackground} !important`,
275
- color: addedText,
276
- padding: generalDiff.insertedLinePadding,
277
- borderRadius: generalDiff.borderRadius,
278
- border: `1px solid ${addedText}40`,
279
- },
280
- 'ins.cm-insertedLine .cm-changedText': {
281
- background: 'transparent !important',
282
- },
283
- // Deleted/Removed Content
284
- '.cm-deletedLine': {
285
- textDecoration: generalDiff.deletedTextDecoration,
286
- backgroundColor: removedBackground,
287
- color: removedText,
288
- padding: generalDiff.insertedLinePadding,
289
- borderRadius: generalDiff.borderRadius,
290
- },
291
- 'del.cm-deletedLine, del, del:not(:has(.cm-deletedText))': {
292
- textDecoration: generalDiff.deletedTextDecoration,
293
- backgroundColor: `${removedBackground} !important`,
294
- color: removedText,
295
- padding: generalDiff.insertedLinePadding,
296
- borderRadius: generalDiff.borderRadius,
297
- border: `1px solid ${removedText}40`,
298
- },
299
- 'del .cm-deletedText, del .cm-changedText': {
300
- background: 'transparent !important',
301
- },
302
- // Tooltips and autocomplete
303
- '.cm-tooltip': {
304
- backgroundColor: tooltipBackground,
305
- border: `1px solid ${base03}`,
306
- borderRadius: generalTooltip.borderRadius,
307
- padding: generalTooltip.padding,
308
- boxShadow: '0 2px 8px rgba(0, 0, 0, 0.3)',
309
- },
310
- '.cm-tooltip-autocomplete': {
311
- '& > ul': {
312
- backgroundColor: tooltipBackground,
313
- border: 'none',
628
+ removedBackground = '#4a393a80'; // Dark red with transparency for deletions
629
+ const theme = defineTheme({
630
+ dark: true,
631
+ ui: {
632
+ background: base00,
633
+ foreground: base04,
634
+ border: 'none',
635
+ cursor: base04,
636
+ cursorWidth: '2px',
637
+ cursorShadow: 'none',
638
+ fatCursor: { background: `${base04}99`, border: 'none' },
639
+ selection: '#40495b',
640
+ selectionInactive: '#40495b',
641
+ selectionForeground: null,
642
+ selectionOutline: 'none',
643
+ activeLine: highlightBackground,
644
+ activeLineBorder: { left: 'none', right: 'none' },
645
+ ghostText: base03,
646
+ ghostTextOpacity: '0.5',
647
+ specialChar: base0A,
648
+ focusRing: `0 0 0 2px ${base00}, 0 0 0 4px ${base07}`,
649
+ outlineWidth: '1px',
650
+ searchMatch: {
651
+ background: `${base09}80`,
652
+ outline: base06,
653
+ foreground: base04,
654
+ shadow: 'none',
655
+ selectedBackground: base08,
656
+ selectedForeground: base05,
657
+ selectedOutline: `1px solid ${base06}`,
658
+ selectedShadow: 'none',
314
659
  },
315
- '& > ul > li': {
316
- padding: generalTooltip.padding,
317
- lineHeight: generalTooltip.lineHeight,
660
+ selectionMatch: { background: selectionMatch, outline: `${base02}50` },
661
+ matchingBracket: { background: activeBracketBg, outline: base07, shadow: 'none' },
662
+ nonMatchingBracket: { background: `${base0A}40`, outline: invalid },
663
+ panel: {
664
+ background: darkBackground,
665
+ foreground: base04,
666
+ border: base03,
667
+ borderWidth: '1px',
668
+ outline: 'none',
669
+ shadow: 'none',
670
+ buttonBackground: base01,
671
+ buttonForeground: base04,
672
+ buttonBorder: 'none',
673
+ buttonHoverBackground: base02,
674
+ buttonHoverForeground: base04,
675
+ buttonHoverBorder: 'none',
676
+ buttonHoverShadow: 'none',
677
+ inputBackground: base00,
678
+ inputBorder: `1px solid ${base03}`,
318
679
  },
319
- '& > ul > li[aria-selected]': {
320
- backgroundColor: base02,
321
- color: base05,
322
- borderRadius: generalTooltip.borderRadiusSelected,
680
+ gutter: {
681
+ background: darkBackground,
682
+ foreground: base03,
683
+ border: base02,
684
+ activeBackground: base01,
685
+ activeForeground: base04,
686
+ activeFontWeight: '500',
687
+ activeBorder: 'none',
688
+ foldHover: base04,
323
689
  },
324
- '& > ul > li > span.cm-completionIcon': {
325
- color: base03,
326
- paddingRight: generalTooltip.paddingRight,
690
+ foldPlaceholder: { background: base01, foreground: base03, border: `${base03}70`, borderStyle: 'dotted' },
691
+ tooltip: {
692
+ background: base01,
693
+ foreground: base04,
694
+ border: base03,
695
+ shadow: '0 2px 8px rgba(0, 0, 0, 0.3)',
696
+ listBackground: base01,
697
+ listBorder: 'none',
698
+ hoverBackground: 'transparent',
699
+ selectedBackground: base02,
700
+ selectedForeground: base05,
701
+ selectedBorder: 'none',
702
+ icon: base03,
703
+ detail: base03,
327
704
  },
328
- '& > ul > li > span.cm-completionDetail': {
329
- color: base03,
330
- fontStyle: 'italic',
705
+ diff: {
706
+ insertedBackground: addedBackground,
707
+ insertedForeground: base0D,
708
+ insertedBorder: `1px solid ${base0D}40`,
709
+ deletedBackground: removedBackground,
710
+ deletedForeground: base0A,
711
+ deletedBorder: `1px solid ${base0A}40`,
331
712
  },
332
- },
333
- '.cm-tooltip .cm-tooltip-arrow:before': {
334
- borderTopColor: 'transparent',
335
- borderBottomColor: 'transparent',
336
- },
337
- '.cm-tooltip .cm-tooltip-arrow:after': {
338
- borderTopColor: tooltipBackground,
339
- borderBottomColor: tooltipBackground,
340
- },
341
- // Diagnostics styling
342
- '.cm-diagnostic': {
343
- '&-error': {
344
- borderLeft: `3px solid ${base0A}`,
713
+ diagnostic: {
714
+ error: base0A,
715
+ warning: base0C,
716
+ info: base08,
717
+ hint: base08,
718
+ errorBackground: 'transparent',
719
+ warningBackground: 'transparent',
720
+ infoBackground: 'transparent',
721
+ borderWidth: '3px',
722
+ underlineWidth: '2px',
345
723
  },
346
- '&-warning': {
347
- borderLeft: `3px solid ${diagnosticWarning}`,
724
+ scrollbar: {
725
+ track: darkBackground,
726
+ trackBorder: 'none',
727
+ thumb: base02,
728
+ thumbBorder: `3px solid ${darkBackground}`,
729
+ thumbHover: base03,
730
+ thumbHoverShadow: 'none',
348
731
  },
349
- '&-info': {
350
- borderLeft: `3px solid ${linkColor}`,
732
+ merge: {
733
+ backgroundColor: darkBackground,
734
+ borderColor: base03,
735
+ buttonColor: base04,
736
+ buttonHoverColor: base02,
351
737
  },
352
738
  },
353
- '.cm-lintPoint-error': {
354
- borderBottom: `2px wavy ${base0A}`,
355
- },
356
- '.cm-lintPoint-warning': {
357
- borderBottom: `2px wavy ${diagnosticWarning}`,
358
- },
359
- // Matching brackets
360
- '.cm-matchingBracket': {
361
- backgroundColor: activeBracketBg,
362
- outline: `1px solid ${activeBracketBorder}`,
363
- borderRadius: generalMatching.borderRadius,
364
- },
365
- '.cm-nonmatchingBracket': {
366
- backgroundColor: `${base0A}40`,
367
- outline: `1px solid ${invalid}`,
368
- borderRadius: generalMatching.borderRadius,
369
- },
370
- // Selection matches
371
- '.cm-selectionMatch': {
372
- backgroundColor: selectionMatch,
373
- outline: `1px solid ${base02}50`,
374
- borderRadius: generalMatching.borderRadius,
375
- },
376
- // Fold placeholder
377
- '.cm-foldPlaceholder': {
378
- backgroundColor: tooltipBackground,
379
- color: base03,
380
- border: `1px dotted ${base03}70`,
381
- borderRadius: generalPlaceholder.borderRadius,
382
- padding: generalPlaceholder.padding,
383
- margin: generalPlaceholder.margin,
384
- },
385
- // Focus outline
386
- '&.cm-focused': {
387
- outline: 'none',
388
- boxShadow: `0 0 0 2px ${background}, 0 0 0 3px ${base07}40`,
389
- },
390
- // Scrollbars
391
- '& .cm-scroller::-webkit-scrollbar': {
392
- width: generalScroller.width,
393
- height: generalScroller.height,
394
- },
395
- '& .cm-scroller::-webkit-scrollbar-track': {
396
- background: darkBackground,
397
- },
398
- '& .cm-scroller::-webkit-scrollbar-thumb': {
399
- backgroundColor: base02,
400
- borderRadius: generalScroller.borderRadius,
401
- border: `3px solid ${darkBackground}`,
402
- },
403
- '& .cm-scroller::-webkit-scrollbar-thumb:hover': {
404
- backgroundColor: base03,
405
- },
406
- // Ghost text
407
- '.cm-ghostText': {
408
- opacity: '0.5',
409
- color: base03,
410
- },
411
- }, { dark: true });
412
- /**
413
- * Enhanced syntax highlighting for Nord theme
414
- */
415
- const nordHighlightStyle = language.HighlightStyle.define([
416
- // Keywords and control flow
417
- { tag: highlight.tags.keyword, color: base09, fontWeight: 'bold' },
418
- { tag: highlight.tags.controlKeyword, color: base09, fontWeight: 'bold' },
419
- { tag: highlight.tags.moduleKeyword, color: base09, fontWeight: 'bold' },
420
- // Names and variables
421
- { tag: [highlight.tags.name, highlight.tags.deleted, highlight.tags.character, highlight.tags.macroName], color: base07 },
422
- { tag: [highlight.tags.variableName], color: base04 },
423
- { tag: [highlight.tags.propertyName], color: base07, fontStyle: 'normal' },
424
- // Classes and types
425
- { tag: [highlight.tags.typeName], color: base0C },
426
- { tag: [highlight.tags.className], color: base0C, fontStyle: 'italic' },
427
- { tag: [highlight.tags.namespace], color: base08, fontStyle: 'italic' },
428
- // Operators and punctuation
429
- { tag: [highlight.tags.operator, highlight.tags.operatorKeyword], color: base0E },
430
- { tag: [highlight.tags.bracket], color: base04 },
431
- { tag: [highlight.tags.brace], color: base06 },
432
- { tag: [highlight.tags.punctuation], color: base04 },
433
- // Functions and parameters
434
- { tag: [highlight.tags.function(highlight.tags.variableName), highlight.tags.labelName], color: base06 },
435
- { tag: [highlight.tags.definition(highlight.tags.function(highlight.tags.variableName))], color: base06 },
436
- { tag: [highlight.tags.definition(highlight.tags.variableName)], color: base0B },
437
- // Constants and literals
438
- { tag: highlight.tags.number, color: base0B },
439
- { tag: highlight.tags.changed, color: base0E },
440
- { tag: highlight.tags.annotation, color: base0A, fontStyle: 'italic' },
441
- { tag: highlight.tags.modifier, color: base0E, fontStyle: 'italic' },
442
- { tag: highlight.tags.self, color: base0E },
443
- { tag: [highlight.tags.color, highlight.tags.constant(highlight.tags.name), highlight.tags.standard(highlight.tags.name)], color: base0B },
444
- { tag: [highlight.tags.atom, highlight.tags.bool, highlight.tags.special(highlight.tags.variableName)], color: base0E },
445
- // Strings and regex
446
- { tag: [highlight.tags.processingInstruction, highlight.tags.inserted], color: base06 },
447
- { tag: [highlight.tags.special(highlight.tags.string), highlight.tags.regexp], color: base0E },
448
- { tag: highlight.tags.string, color: base0D },
449
- // Punctuation and structure
450
- { tag: highlight.tags.definition(highlight.tags.typeName), color: base0C, fontWeight: 'bold' },
451
- { tag: [highlight.tags.definition(highlight.tags.name), highlight.tags.separator], color: base0D },
452
- // Comments and documentation
453
- { tag: highlight.tags.meta, color: base03 },
454
- { tag: highlight.tags.comment, fontStyle: 'italic', color: base03 },
455
- { tag: highlight.tags.docComment, fontStyle: 'italic', color: base03 },
456
- // HTML/XML elements
457
- { tag: [highlight.tags.tagName], color: base0A },
458
- { tag: [highlight.tags.attributeName], color: base0C },
459
- // Markdown and text formatting
460
- { tag: [highlight.tags.heading], fontWeight: 'bold', color: base08 },
461
- { tag: [highlight.tags.strong], fontWeight: 'bold', color: base07 },
462
- { tag: [highlight.tags.emphasis], fontStyle: 'italic', color: base0C },
463
- // Links and URLs
464
- {
465
- tag: [highlight.tags.link],
466
- color: visitedLinkColor,
467
- fontWeight: '500',
468
- textDecoration: 'underline',
469
- textUnderlinePosition: 'under',
470
- },
471
- {
472
- tag: [highlight.tags.url],
473
- color: linkColor,
474
- textDecoration: 'underline',
475
- textUnderlineOffset: '2px',
476
- },
477
- // Special states
478
- {
479
- tag: [highlight.tags.invalid],
480
- color: base04,
481
- textDecoration: 'underline wavy',
482
- borderBottom: `1px wavy ${base0A}`,
483
- },
484
- { tag: [highlight.tags.strikethrough], color: base0A, textDecoration: 'line-through' },
485
- // Enhanced syntax highlighting
486
- { tag: highlight.tags.constant(highlight.tags.name), color: base0B },
487
- { tag: highlight.tags.deleted, color: base0A },
488
- { tag: highlight.tags.squareBracket, color: base0A },
489
- { tag: highlight.tags.angleBracket, color: base0B },
490
- // Additional specific styles
491
- { tag: highlight.tags.monospace, color: base04, fontStyle: 'italic' },
492
- { tag: [highlight.tags.contentSeparator], color: base08 },
493
- { tag: highlight.tags.quote, color: base0E },
494
- { tag: highlight.tags.integer, color: base0B },
495
- { tag: highlight.tags.float, color: base0B },
496
- { tag: highlight.tags.null, color: base0B },
497
- { tag: highlight.tags.attributeValue, color: base0D },
498
- { tag: highlight.tags.escape, color: base0D },
499
- { tag: highlight.tags.paren, color: base04 },
500
- { tag: highlight.tags.lineComment, color: base03, fontStyle: 'italic' },
501
- { tag: highlight.tags.blockComment, color: base03, fontStyle: 'italic' },
502
- { tag: highlight.tags.definitionKeyword, color: base09 },
503
- { tag: highlight.tags.arithmeticOperator, color: base0E },
504
- { tag: highlight.tags.logicOperator, color: base0E },
505
- { tag: highlight.tags.compareOperator, color: base0E },
506
- { tag: highlight.tags.bitwiseOperator, color: base0E },
507
- { tag: highlight.tags.updateOperator, color: base0E },
508
- { tag: highlight.tags.derefOperator, color: base0E },
509
- { tag: highlight.tags.local(highlight.tags.variableName), color: base0B },
510
- { tag: highlight.tags.list, color: base08 },
511
- { tag: highlight.tags.unit, color: base0B },
512
- { tag: highlight.tags.heading1, color: base08 },
513
- { tag: highlight.tags.heading2, color: base08 },
514
- { tag: highlight.tags.heading3, color: base08 },
515
- { tag: highlight.tags.heading4, color: base08 },
516
- { tag: highlight.tags.heading5, color: base08 },
517
- { tag: highlight.tags.heading6, color: base08 },
518
- ]);
739
+ syntax: {
740
+ keyword: { color: base09, fontWeight: 'bold' },
741
+ definitionKeyword: { color: base09 },
742
+ modifier: { color: base0E, fontStyle: 'italic' },
743
+ separator: { color: base0D },
744
+ angleBracket: { color: base0B },
745
+ squareBracket: { color: base0A },
746
+ brace: { color: base06 },
747
+ operator: { color: base0E },
748
+ punctuation: { color: base04 },
749
+ name: { color: base07 },
750
+ variable: { color: base04 },
751
+ localVariable: { color: base0B },
752
+ variableDefinition: { color: base0B },
753
+ nameDefinition: { color: base0D },
754
+ function: { color: base06 },
755
+ self: { color: base0E },
756
+ label: { color: base06 },
757
+ property: { color: base07, fontStyle: 'normal' },
758
+ type: { color: base0C },
759
+ typeDefinition: { color: base0C, fontWeight: 'bold' },
760
+ className: { color: base0C, fontStyle: 'italic' },
761
+ namespace: { color: base08, fontStyle: 'italic' },
762
+ tag: { color: base0A },
763
+ attribute: { color: base0C },
764
+ content: { color: base04 },
765
+ string: { color: base0D },
766
+ regexp: { color: base0E },
767
+ atom: { color: base0E },
768
+ specialVariable: { color: base0E },
769
+ number: { color: base0B },
770
+ constant: { color: base0B },
771
+ comment: { fontStyle: 'italic', color: base03 },
772
+ meta: { color: base03 },
773
+ processingInstruction: { color: base06 },
774
+ annotation: { color: base0A, fontStyle: 'italic' },
775
+ heading: { fontWeight: 'bold', color: base08 },
776
+ headingLevel: { color: base08 },
777
+ list: { color: base08 },
778
+ quote: { color: base0E },
779
+ monospace: { color: base04, fontStyle: 'italic' },
780
+ contentSeparator: { color: base08 },
781
+ link: {
782
+ color: base0E,
783
+ fontWeight: '500',
784
+ textDecoration: 'underline',
785
+ textUnderlinePosition: 'under',
786
+ },
787
+ url: { color: base08, textDecoration: 'underline', textUnderlineOffset: '2px' },
788
+ emphasis: { fontStyle: 'italic', color: base0C },
789
+ strong: { fontWeight: 'bold', color: base07 },
790
+ strikethrough: { color: base0A, textDecoration: 'line-through' },
791
+ invalid: { color: base04, textDecoration: 'underline wavy', borderBottom: `1px wavy ${base0A}` },
792
+ inserted: { color: base06 },
793
+ deleted: { color: base0A },
794
+ changed: { color: base0E },
795
+ },
796
+ });
519
797
  /**
520
798
  * Combined Nord theme extension
521
799
  */
522
- const nord = [nordTheme, language.syntaxHighlighting(nordHighlightStyle)];
800
+ const nord = theme.extension;
523
801
  /**
524
802
  * Nord merge revert styles configuration
525
803
  */
526
- const nordMergeStyles = {
527
- backgroundColor: darkBackground,
528
- borderColor: base03,
529
- buttonColor: base04,
530
- buttonHoverColor: base02,
531
- };
804
+ const nordMergeStyles = theme.mergeStyles;
532
805
 
533
806
  exports.applyMergeRevertStyles = applyMergeRevertStyles;
534
807
  exports.nord = nord;