@fsegurai/codemirror-theme-palenight 6.2.5 → 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 +659 -366
  3. package/dist/index.js +659 -366
  4. package/package.json +12 -3
package/dist/index.cjs CHANGED
@@ -1,7 +1,7 @@
1
1
  'use strict';
2
2
 
3
- var view = require('@codemirror/view');
4
3
  var language = require('@codemirror/language');
4
+ var view = require('@codemirror/view');
5
5
  var highlight = require('@lezer/highlight');
6
6
 
7
7
  // Helper module for styling options
@@ -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 Palenight theme color definitions
111
598
  * ---------------------------------------
@@ -113,9 +600,9 @@ function applyMergeRevertStyles(styles) {
113
600
  */
114
601
  // Base colors
115
602
  const base00 = '#292D3E', // Background - deep indigo
116
- base01 = '#A6ACCD', // Foreground - lavender blue
603
+ base01 = '#adb4d5', // Foreground - lavender blue
117
604
  base02 = '#444267', // Selection background - muted indigo
118
- base03 = '#676E95', // Comments, invisible - steel blue
605
+ base03 = '#9ca5ce', // Comments, invisible - steel blue
119
606
  base04 = '#BFC7D5', // Cursor - lighter lavender
120
607
  // Accent colors
121
608
  base05 = '#C3E88D', // Strings - light green
@@ -124,387 +611,193 @@ base07 = '#C792EA', // Classes, Types - purple
124
611
  base08 = '#F78C6C', // Numbers, Constants - orange
125
612
  base09 = '#FFCB6B', // Classes, Attributes - yellow
126
613
  base0A = '#89DDFF', // Punctuation, Operators - light blue
127
- base0B = '#FF5370', // Tags, Errors - red
128
- base0C = '#BB80B3', // Special elements - mauve
614
+ base0B = '#fe7f8d', // Tags, Errors - red
615
+ base0C = '#cf93c7', // Special elements - mauve
129
616
  base0D = '#80CBC4'; // Properties - seafoam
130
617
  // UI specific colors
131
- const invalid = '#FF5370', // Error color - red
132
- darkBackground = '#202331', // Darker background for panels and gutter
618
+ const darkBackground = '#202331', // Darker background for panels and gutter
133
619
  highlightBackground = '#2e324817', // Active line background
134
- background = base00, // Main editor background
135
620
  tooltipBackground = '#343A50', // Tooltip background
136
- selection = base02, // Selection background
137
621
  selectionMatch = '#444267AA', // Selection match with opacity
138
- cursor = base04, // Cursor color
139
- activeBracketBg = '#2E3248', // Active bracket background
140
- activeBracketBorder = base06, // Active bracket border - sky blue
141
- diagnosticWarning = base09, // Warning color - yellow
142
- linkColor = base06, // Link color - sky blue
143
- visitedLinkColor = base07; // Visited link color - purple
622
+ activeBracketBg = '#2E3248'; // Active bracket background
144
623
  // Diff/merge specific colors
145
624
  const addedBackground = '#2c3c2e80', // Dark green with transparency for insertions
146
- removedBackground = '#3e2e3180', // Dark red with transparency for deletions
147
- addedText = '#C3E88D', // Palenight green for added text
148
- removedText = '#FF5370'; // Palenight red for removed text
149
- /**
150
- * Enhanced editor theme styles for Palenight
151
- */
152
- const palenightTheme = view.EditorView.theme({
153
- // Base editor styles
154
- '&': {
155
- color: base01,
156
- backgroundColor: background,
157
- fontSize: generalContent.fontSize,
158
- fontFamily: generalContent.fontFamily,
159
- },
160
- // Content and cursor
161
- '.cm-content': {
162
- caretColor: cursor,
163
- lineHeight: generalContent.lineHeight,
164
- },
165
- '.cm-cursor, .cm-dropCursor': {
166
- borderLeftColor: cursor,
167
- borderLeftWidth: generalCursor.borderLeftWidth,
168
- },
169
- '.cm-fat-cursor': {
170
- backgroundColor: `${cursor}99`,
171
- color: background,
172
- },
173
- // Selection
174
- '&.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection': {
175
- backgroundColor: selection,
176
- },
177
- // Make sure selection appears above active line
178
- '.cm-selectionLayer': {
179
- zIndex: 100,
180
- },
181
- // Search functionality
182
- '.cm-searchMatch': {
183
- backgroundColor: '#444267CC',
184
- outline: `1px solid ${base06}`,
185
- color: base01,
186
- borderRadius: generalSearchField.borderRadius,
187
- '& span': {
188
- color: base01,
625
+ removedBackground = '#3e2e3180'; // Dark red with transparency for deletions
626
+ const theme = defineTheme({
627
+ dark: true,
628
+ ui: {
629
+ background: base00,
630
+ foreground: base01,
631
+ border: 'none',
632
+ cursor: base04,
633
+ cursorWidth: '2px',
634
+ cursorShadow: 'none',
635
+ fatCursor: { background: `${base04}99`, border: 'none' },
636
+ selection: '#3b385d',
637
+ selectionInactive: '#3b385d',
638
+ selectionForeground: null,
639
+ selectionOutline: 'none',
640
+ activeLine: highlightBackground,
641
+ activeLineBorder: { left: 'none', right: 'none' },
642
+ ghostText: base03,
643
+ ghostTextOpacity: '0.5',
644
+ specialChar: base0B,
645
+ focusRing: `0 0 0 2px ${base00}, 0 0 0 4px ${base06}`,
646
+ outlineWidth: '1px',
647
+ searchMatch: {
648
+ background: `${base02}CC`,
649
+ outline: base06,
650
+ foreground: base01,
651
+ shadow: 'none',
652
+ selectedBackground: base06,
653
+ selectedForeground: base00,
654
+ selectedOutline: `1px solid ${base06}`,
655
+ selectedShadow: 'none',
189
656
  },
190
- },
191
- '.cm-searchMatch.cm-searchMatch-selected': {
192
- backgroundColor: base06,
193
- color: background,
194
- padding: generalSearchField.padding,
195
- '& span': {
196
- color: background,
197
- },
198
- },
199
- '.cm-search.cm-panel.cm-textfield': {
200
- color: base01,
201
- borderRadius: generalSearchField.borderRadius,
202
- padding: generalSearchField.padding,
203
- },
204
- // Panels
205
- '.cm-panels': {
206
- backgroundColor: darkBackground,
207
- color: base01,
208
- borderRadius: '4px',
209
- },
210
- '.cm-panels.cm-panels-top': {
211
- borderBottom: `1px solid ${base02}`,
212
- },
213
- '.cm-panels.cm-panels-bottom': {
214
- borderTop: `1px solid ${base02}`,
215
- },
216
- '.cm-panel button': {
217
- backgroundColor: tooltipBackground,
218
- color: base01,
219
- border: generalPanel.border,
220
- borderRadius: generalPanel.borderRadius,
221
- padding: generalPanel.padding,
222
- },
223
- '.cm-panel button:hover': {
224
- backgroundColor: '#3A4058',
225
- },
226
- // Line highlighting
227
- '.cm-activeLine': {
228
- backgroundColor: highlightBackground,
229
- borderRadius: generalLine.borderRadius,
230
- zIndex: 1,
231
- },
232
- // Gutters
233
- '.cm-gutters': {
234
- backgroundColor: darkBackground,
235
- color: base03,
236
- border: generalGutter.border,
237
- borderRight: '1px solid #3A405880',
238
- paddingRight: generalGutter.paddingRight,
239
- },
240
- '.cm-activeLineGutter': {
241
- backgroundColor: '#2A2D40',
242
- color: base01,
243
- fontWeight: generalGutter.fontWeight,
244
- },
245
- '.cm-lineNumbers': {
246
- fontSize: generalGutter.fontSize,
247
- lineHeight: generalGutter.lineHeight,
248
- },
249
- '.cm-foldGutter': {
250
- fontSize: generalGutter.fontSize,
251
- lineHeight: generalGutter.lineHeight,
252
- },
253
- '.cm-foldGutter .cm-gutterElement': {
254
- color: base03,
255
- cursor: 'pointer',
256
- },
257
- '.cm-foldGutter .cm-gutterElement:hover': {
258
- color: base01,
259
- },
260
- // Diff/Merge View Styles
261
- // Inserted/Added Content
262
- '.cm-insertedLine': {
263
- textDecoration: generalDiff.insertedTextDecoration,
264
- backgroundColor: addedBackground,
265
- color: addedText,
266
- padding: generalDiff.insertedLinePadding,
267
- borderRadius: generalDiff.borderRadius,
268
- },
269
- 'ins.cm-insertedLine, ins.cm-insertedLine:not(:has(.cm-changedText))': {
270
- textDecoration: generalDiff.insertedTextDecoration,
271
- backgroundColor: `${addedBackground} !important`,
272
- color: addedText,
273
- padding: generalDiff.insertedLinePadding,
274
- borderRadius: generalDiff.borderRadius,
275
- border: `1px solid ${addedText}40`,
276
- },
277
- 'ins.cm-insertedLine .cm-changedText': {
278
- background: 'transparent !important',
279
- },
280
- // Deleted/Removed Content
281
- '.cm-deletedLine': {
282
- textDecoration: generalDiff.deletedTextDecoration,
283
- backgroundColor: removedBackground,
284
- color: removedText,
285
- padding: generalDiff.insertedLinePadding,
286
- borderRadius: generalDiff.borderRadius,
287
- },
288
- 'del.cm-deletedLine, del, del:not(:has(.cm-deletedText))': {
289
- textDecoration: generalDiff.deletedTextDecoration,
290
- backgroundColor: `${removedBackground} !important`,
291
- color: removedText,
292
- padding: generalDiff.insertedLinePadding,
293
- borderRadius: generalDiff.borderRadius,
294
- border: `1px solid ${removedText}40`,
295
- },
296
- 'del .cm-deletedText, del .cm-changedText': {
297
- background: 'transparent !important',
298
- },
299
- // Tooltips and autocomplete
300
- '.cm-tooltip': {
301
- backgroundColor: tooltipBackground,
302
- border: '1px solid #3A4058',
303
- borderRadius: generalTooltip.borderRadius,
304
- padding: generalTooltip.padding,
305
- boxShadow: '0 2px 8px rgba(0, 0, 0, 0.4)',
306
- },
307
- '.cm-tooltip-autocomplete': {
308
- '& > ul': {
309
- backgroundColor: tooltipBackground,
310
- border: 'none',
657
+ selectionMatch: { background: selectionMatch, outline: `${base03}50` },
658
+ matchingBracket: { background: activeBracketBg, outline: base06, shadow: 'none' },
659
+ nonMatchingBracket: { background: `${base0B}40`, outline: base0B },
660
+ panel: {
661
+ background: darkBackground,
662
+ foreground: base01,
663
+ border: base02,
664
+ borderWidth: '1px',
665
+ outline: 'none',
666
+ shadow: 'none',
667
+ buttonBackground: tooltipBackground,
668
+ buttonForeground: base01,
669
+ buttonBorder: 'none',
670
+ buttonHoverBackground: '#3A4058',
671
+ buttonHoverForeground: base01,
672
+ buttonHoverBorder: 'none',
673
+ buttonHoverShadow: 'none',
674
+ inputBackground: base00,
675
+ inputBorder: `1px solid ${base02}`,
311
676
  },
312
- '& > ul > li': {
313
- padding: generalTooltip.padding,
314
- lineHeight: generalTooltip.lineHeight,
677
+ gutter: {
678
+ background: darkBackground,
679
+ foreground: base03,
680
+ border: '#3A405880',
681
+ activeBackground: '#2A2D40',
682
+ activeForeground: base01,
683
+ activeFontWeight: '500',
684
+ activeBorder: 'none',
685
+ foldHover: base01,
315
686
  },
316
- '& > ul > li[aria-selected]': {
317
- backgroundColor: selection,
318
- color: base04,
319
- borderRadius: generalTooltip.borderRadiusSelected,
687
+ foldPlaceholder: {
688
+ background: tooltipBackground,
689
+ foreground: base03,
690
+ border: `${base03}70`,
691
+ borderStyle: 'dotted',
320
692
  },
321
- '& > ul > li > span.cm-completionIcon': {
322
- color: base03,
323
- paddingRight: generalTooltip.paddingRight,
693
+ tooltip: {
694
+ background: tooltipBackground,
695
+ foreground: base01,
696
+ border: '#3A4058',
697
+ shadow: '0 2px 8px rgba(0, 0, 0, 0.4)',
698
+ listBackground: tooltipBackground,
699
+ listBorder: 'none',
700
+ hoverBackground: 'transparent',
701
+ selectedBackground: base02,
702
+ selectedForeground: base04,
703
+ selectedBorder: 'none',
704
+ icon: base03,
705
+ detail: base03,
324
706
  },
325
- '& > ul > li > span.cm-completionDetail': {
326
- color: base03,
327
- fontStyle: 'italic',
707
+ diff: {
708
+ insertedBackground: addedBackground,
709
+ insertedForeground: base05,
710
+ insertedBorder: `1px solid ${base05}40`,
711
+ deletedBackground: removedBackground,
712
+ deletedForeground: base0B,
713
+ deletedBorder: `1px solid ${base0B}40`,
328
714
  },
329
- },
330
- '.cm-tooltip .cm-tooltip-arrow:before': {
331
- borderTopColor: 'transparent',
332
- borderBottomColor: 'transparent',
333
- },
334
- '.cm-tooltip .cm-tooltip-arrow:after': {
335
- borderTopColor: tooltipBackground,
336
- borderBottomColor: tooltipBackground,
337
- },
338
- // Diagnostics styling
339
- '.cm-diagnostic': {
340
- '&-error': {
341
- borderLeft: `3px solid ${invalid}`,
715
+ diagnostic: {
716
+ error: base0B,
717
+ warning: base09,
718
+ info: base06,
719
+ hint: base06,
720
+ errorBackground: 'transparent',
721
+ warningBackground: 'transparent',
722
+ infoBackground: 'transparent',
723
+ borderWidth: '3px',
724
+ underlineWidth: '2px',
342
725
  },
343
- '&-warning': {
344
- borderLeft: `3px solid ${diagnosticWarning}`,
726
+ scrollbar: {
727
+ track: darkBackground,
728
+ trackBorder: 'none',
729
+ thumb: base02,
730
+ thumbBorder: `3px solid ${darkBackground}`,
731
+ thumbHover: '#515580',
732
+ thumbHoverShadow: 'none',
345
733
  },
346
- '&-info': {
347
- borderLeft: `3px solid ${linkColor}`,
734
+ merge: {
735
+ backgroundColor: darkBackground,
736
+ borderColor: '#3A4058',
737
+ buttonColor: base01,
738
+ buttonHoverColor: '#3A4058',
348
739
  },
349
740
  },
350
- '.cm-lintPoint-error': {
351
- borderBottom: `2px wavy ${invalid}`,
352
- },
353
- '.cm-lintPoint-warning': {
354
- borderBottom: `2px wavy ${diagnosticWarning}`,
355
- },
356
- // Matching brackets
357
- '.cm-matchingBracket': {
358
- backgroundColor: activeBracketBg,
359
- outline: `1px solid ${activeBracketBorder}`,
360
- borderRadius: generalMatching.borderRadius,
361
- },
362
- '.cm-nonmatchingBracket': {
363
- backgroundColor: `${invalid}40`,
364
- outline: `1px solid ${invalid}`,
365
- borderRadius: generalMatching.borderRadius,
366
- },
367
- // Selection matches
368
- '.cm-selectionMatch': {
369
- backgroundColor: selectionMatch,
370
- outline: `1px solid ${base03}50`,
371
- borderRadius: generalMatching.borderRadius,
372
- },
373
- // Fold placeholder
374
- '.cm-foldPlaceholder': {
375
- backgroundColor: tooltipBackground,
376
- color: base03,
377
- border: `1px dotted ${base03}70`,
378
- borderRadius: generalPlaceholder.borderRadius,
379
- padding: generalPlaceholder.padding,
380
- margin: generalPlaceholder.margin,
381
- },
382
- // Focus outline
383
- '&.cm-focused': {
384
- outline: 'none',
385
- boxShadow: `0 0 0 2px ${background}, 0 0 0 3px ${base06}40`,
386
- },
387
- // Scrollbars
388
- '& .cm-scroller::-webkit-scrollbar': {
389
- width: generalScroller.width,
390
- height: generalScroller.height,
391
- },
392
- '& .cm-scroller::-webkit-scrollbar-track': {
393
- background: darkBackground,
394
- },
395
- '& .cm-scroller::-webkit-scrollbar-thumb': {
396
- backgroundColor: base02,
397
- borderRadius: generalScroller.borderRadius,
398
- border: `3px solid ${darkBackground}`,
399
- },
400
- '& .cm-scroller::-webkit-scrollbar-thumb:hover': {
401
- backgroundColor: '#515580',
402
- },
403
- // Ghost text
404
- '.cm-ghostText': {
405
- opacity: '0.5',
406
- color: base03,
407
- },
408
- }, { dark: true });
409
- /**
410
- * Enhanced syntax highlighting for Palenight theme
411
- */
412
- const palenightHighlightStyle = language.HighlightStyle.define([
413
- // Keywords and control flow
414
- { tag: highlight.tags.keyword, color: base06, fontWeight: 'bold' },
415
- { tag: highlight.tags.controlKeyword, color: base06, fontWeight: 'bold' },
416
- { tag: highlight.tags.moduleKeyword, color: base06, fontWeight: 'bold' },
417
- // Names and variables
418
- { tag: [highlight.tags.name, highlight.tags.deleted, highlight.tags.character, highlight.tags.macroName], color: base01 },
419
- { tag: [highlight.tags.variableName], color: base01 },
420
- { tag: [highlight.tags.propertyName], color: base0D, fontStyle: 'normal' },
421
- // Classes and types
422
- { tag: [highlight.tags.typeName], color: base07 },
423
- { tag: [highlight.tags.className], color: base09, fontStyle: 'italic' },
424
- { tag: [highlight.tags.namespace], color: base09, fontStyle: 'italic' },
425
- // Operators and punctuation
426
- { tag: [highlight.tags.operator, highlight.tags.operatorKeyword], color: base0A },
427
- { tag: [highlight.tags.bracket], color: base0A },
428
- { tag: [highlight.tags.brace], color: base0A },
429
- { tag: [highlight.tags.punctuation], color: base0A },
430
- // Functions and parameters
431
- { tag: [highlight.tags.function(highlight.tags.variableName), highlight.tags.labelName], color: base06 },
432
- { tag: [highlight.tags.definition(highlight.tags.function(highlight.tags.variableName))], color: base06 },
433
- { tag: [highlight.tags.definition(highlight.tags.variableName)], color: base08 },
434
- // Constants and literals
435
- { tag: highlight.tags.number, color: base08 },
436
- { tag: highlight.tags.changed, color: base08 },
437
- { tag: highlight.tags.annotation, color: invalid, fontStyle: 'italic' },
438
- { tag: highlight.tags.modifier, color: base0C, fontStyle: 'italic' },
439
- { tag: highlight.tags.self, color: base07 },
440
- { tag: [highlight.tags.color, highlight.tags.constant(highlight.tags.name), highlight.tags.standard(highlight.tags.name)], color: base08 },
441
- { tag: [highlight.tags.atom, highlight.tags.bool, highlight.tags.special(highlight.tags.variableName)], color: base0C },
442
- // Strings and regex
443
- { tag: [highlight.tags.processingInstruction, highlight.tags.inserted], color: base05 },
444
- { tag: [highlight.tags.special(highlight.tags.string), highlight.tags.regexp], color: base05 },
445
- { tag: highlight.tags.string, color: base05 },
446
- // Punctuation and structure
447
- { tag: highlight.tags.definition(highlight.tags.typeName), color: base07, fontWeight: 'bold' },
448
- { tag: [highlight.tags.definition(highlight.tags.name), highlight.tags.separator], color: base0A },
449
- // Comments and documentation
450
- { tag: highlight.tags.meta, color: base03 },
451
- { tag: highlight.tags.comment, fontStyle: 'italic', color: base03 },
452
- { tag: highlight.tags.docComment, fontStyle: 'italic', color: base03 },
453
- // HTML/XML elements
454
- { tag: [highlight.tags.tagName], color: base0B },
455
- { tag: [highlight.tags.attributeName], color: base09 },
456
- // Markdown and text formatting
457
- { tag: [highlight.tags.heading], fontWeight: 'bold', color: base09 },
458
- { tag: [highlight.tags.strong], fontWeight: 'bold', color: base09 },
459
- { tag: [highlight.tags.emphasis], fontStyle: 'italic', color: base05 },
460
- // Links and URLs
461
- {
462
- tag: [highlight.tags.link],
463
- color: visitedLinkColor,
464
- fontWeight: '500',
465
- textDecoration: 'underline',
466
- textUnderlinePosition: 'under',
467
- },
468
- {
469
- tag: [highlight.tags.url],
470
- color: linkColor,
471
- textDecoration: 'underline',
472
- textUnderlineOffset: '2px',
473
- },
474
- // Special states
475
- {
476
- tag: [highlight.tags.invalid],
477
- color: base01,
478
- textDecoration: 'underline wavy',
479
- borderBottom: `1px wavy ${invalid}`,
480
- },
481
- { tag: [highlight.tags.strikethrough], color: invalid, textDecoration: 'line-through' },
482
- // Enhanced syntax highlighting
483
- { tag: highlight.tags.constant(highlight.tags.name), color: base08 },
484
- { tag: highlight.tags.deleted, color: invalid },
485
- { tag: highlight.tags.squareBracket, color: base0A },
486
- { tag: highlight.tags.angleBracket, color: base0A },
487
- // Additional specific styles
488
- { tag: highlight.tags.monospace, color: base01 },
489
- { tag: [highlight.tags.contentSeparator], color: base09 },
490
- { tag: highlight.tags.quote, color: base03 },
491
- ]);
741
+ syntax: {
742
+ keyword: { color: base06, fontWeight: 'bold' },
743
+ definitionKeyword: { color: base06 },
744
+ modifier: { color: base0C, fontStyle: 'italic' },
745
+ operator: { color: base0A },
746
+ punctuation: { color: base0A },
747
+ name: { color: base01 },
748
+ localVariable: { color: base08 },
749
+ variableDefinition: { color: base08 },
750
+ nameDefinition: { color: base0A },
751
+ function: { color: base06 },
752
+ self: { color: base07 },
753
+ label: { color: base06 },
754
+ property: { color: base0D, fontStyle: 'normal' },
755
+ type: { color: base07 },
756
+ typeDefinition: { color: base07, fontWeight: 'bold' },
757
+ className: { color: base09, fontStyle: 'italic' },
758
+ namespace: { color: base09, fontStyle: 'italic' },
759
+ tag: { color: base0B },
760
+ attribute: { color: base09 },
761
+ content: { color: base01 },
762
+ string: { color: base05 },
763
+ number: { color: base08 },
764
+ constant: { color: base08 },
765
+ comment: { fontStyle: 'italic', color: base03 },
766
+ meta: { color: base03 },
767
+ processingInstruction: { color: base05 },
768
+ atom: { color: base0C },
769
+ specialVariable: { color: base0C },
770
+ annotation: { color: base0B, fontStyle: 'italic' },
771
+ heading: { fontWeight: 'bold', color: base09 },
772
+ headingLevel: { color: base09 },
773
+ list: { color: base09 },
774
+ quote: { color: base03 },
775
+ monospace: { color: base01 },
776
+ contentSeparator: { color: base09 },
777
+ link: {
778
+ color: base07,
779
+ fontWeight: '500',
780
+ textDecoration: 'underline',
781
+ textUnderlinePosition: 'under',
782
+ },
783
+ url: { color: base06, textDecoration: 'underline', textUnderlineOffset: '2px' },
784
+ emphasis: { fontStyle: 'italic', color: base05 },
785
+ strong: { fontWeight: 'bold', color: base09 },
786
+ strikethrough: { color: base0B, textDecoration: 'line-through' },
787
+ invalid: { color: base01, textDecoration: 'underline wavy', borderBottom: `1px wavy ${base0B}` },
788
+ inserted: { color: base05 },
789
+ deleted: { color: base0B },
790
+ changed: { color: base08 },
791
+ },
792
+ });
492
793
  /**
493
794
  * Combined Palenight theme extension
494
795
  */
495
- const palenight = [
496
- palenightTheme,
497
- language.syntaxHighlighting(palenightHighlightStyle),
498
- ];
796
+ const palenight = theme.extension;
499
797
  /**
500
798
  * Palenight merge revert styles configuration
501
799
  */
502
- const palenightMergeStyles = {
503
- backgroundColor: darkBackground,
504
- borderColor: '#3A4058',
505
- buttonColor: base01,
506
- buttonHoverColor: '#3A4058',
507
- };
800
+ const palenightMergeStyles = theme.mergeStyles;
508
801
 
509
802
  exports.applyMergeRevertStyles = applyMergeRevertStyles;
510
803
  exports.palenight = palenight;