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