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