@fsegurai/codemirror-theme-solarized-light 6.2.7 → 6.4.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.
- package/README.md +40 -32
- package/dist/index.cjs +183 -444
- package/dist/index.js +183 -444
- package/package.json +4 -1
package/dist/index.cjs
CHANGED
|
@@ -1,62 +1,8 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
-
var
|
|
4
|
-
var view = require('@codemirror/view');
|
|
5
|
-
var highlight = require('@lezer/highlight');
|
|
3
|
+
var codemirrorThemeCore = require('@fsegurai/codemirror-theme-core');
|
|
6
4
|
|
|
7
5
|
// Helper module for styling options
|
|
8
|
-
const generalContent = {
|
|
9
|
-
fontSize: '14px',
|
|
10
|
-
fontFamily: 'JetBrains Mono, Consolas, monospace',
|
|
11
|
-
lineHeight: '1.6',
|
|
12
|
-
};
|
|
13
|
-
const generalCursor = {
|
|
14
|
-
borderLeftWidth: '2px',
|
|
15
|
-
};
|
|
16
|
-
const generalDiff = {
|
|
17
|
-
insertedTextDecoration: 'none',
|
|
18
|
-
deletedTextDecoration: 'line-through',
|
|
19
|
-
insertedLinePadding: '1px 3px',
|
|
20
|
-
borderRadius: '3px'};
|
|
21
|
-
const generalGutter = {
|
|
22
|
-
border: 'none',
|
|
23
|
-
paddingRight: '8px',
|
|
24
|
-
fontSize: '0.9em',
|
|
25
|
-
fontWeight: '500',
|
|
26
|
-
lineHeight: '1.78', // Adjusted to compensate for 0.9em fontSize (1.6 / 0.9 ≈ 1.78)
|
|
27
|
-
};
|
|
28
|
-
const generalPanel = {
|
|
29
|
-
border: 'none',
|
|
30
|
-
borderRadius: '4px',
|
|
31
|
-
padding: '2px 10px',
|
|
32
|
-
};
|
|
33
|
-
const generalLine = {
|
|
34
|
-
borderRadius: '2px',
|
|
35
|
-
};
|
|
36
|
-
const generalMatching = {
|
|
37
|
-
borderRadius: '2px',
|
|
38
|
-
};
|
|
39
|
-
const generalPlaceholder = {
|
|
40
|
-
borderRadius: '4px',
|
|
41
|
-
padding: '0 5px',
|
|
42
|
-
margin: '0 2px',
|
|
43
|
-
};
|
|
44
|
-
const generalScroller = {
|
|
45
|
-
width: '12px',
|
|
46
|
-
height: '12px',
|
|
47
|
-
borderRadius: '6px',
|
|
48
|
-
};
|
|
49
|
-
const generalSearchField = {
|
|
50
|
-
borderRadius: '4px',
|
|
51
|
-
padding: '2px 6px',
|
|
52
|
-
};
|
|
53
|
-
const generalTooltip = {
|
|
54
|
-
borderRadius: '4px',
|
|
55
|
-
borderRadiusSelected: '3px',
|
|
56
|
-
lineHeight: '1.3',
|
|
57
|
-
padding: '4px 8px',
|
|
58
|
-
paddingRight: '8px',
|
|
59
|
-
};
|
|
60
6
|
/**
|
|
61
7
|
* Function to apply merge revert styles for a theme
|
|
62
8
|
* @param styles Styles for the merge revert buttons
|
|
@@ -112,8 +58,8 @@ function applyMergeRevertStyles(styles) {
|
|
|
112
58
|
* Colors organized by function with visual color blocks
|
|
113
59
|
*/
|
|
114
60
|
// Base colors from Solarized palette
|
|
115
|
-
const base00 = '#
|
|
116
|
-
base01 = '#
|
|
61
|
+
const base00 = '#50656d', // Body text/default text color
|
|
62
|
+
base01 = '#4d6269', // Optional emphasized content
|
|
117
63
|
base02 = '#073642', // Background highlights
|
|
118
64
|
base03 = '#002b36', // Comments, invisible, line highlighting
|
|
119
65
|
base04 = '#dfd9c8', // Dark background tint
|
|
@@ -122,416 +68,209 @@ base06 = '#cceeff7a', // Light background tint (for selection)
|
|
|
122
68
|
base07 = '#fdf6e3', // Background - light base
|
|
123
69
|
base08 = '#eee8d5', // Background tint - light secondary
|
|
124
70
|
// Accent colors from Solarized palette
|
|
125
|
-
base09 = '#
|
|
126
|
-
base0A = '#
|
|
127
|
-
base0B = '#
|
|
128
|
-
base0C = '#
|
|
129
|
-
base0D = '#
|
|
130
|
-
base0E = '#
|
|
131
|
-
base0F = '#
|
|
132
|
-
base10 = '#
|
|
71
|
+
base09 = '#c40e18', // Red
|
|
72
|
+
base0A = '#af3a03', // Orange
|
|
73
|
+
base0B = '#7c5d05', // Yellow
|
|
74
|
+
base0C = '#5a6804', // Green
|
|
75
|
+
base0D = '#0c6e68', // Cyan
|
|
76
|
+
base0E = '#0a66a1', // Blue
|
|
77
|
+
base0F = '#565aaa', // Violet
|
|
78
|
+
base10 = '#ba166e'; // Magenta
|
|
133
79
|
// UI specific colors
|
|
134
|
-
const invalid = '#
|
|
135
|
-
darkBackground = base04, // Darker background for panels
|
|
136
|
-
highlightBackground = base06, // Active line highlight
|
|
137
|
-
background = base07, // Main editor background
|
|
80
|
+
const invalid = '#c50f0a', // Bright red for errors
|
|
138
81
|
tooltipBackground = '#f0e9d7', // Tooltip background
|
|
139
82
|
selection = '#ffd07a', // Selection background
|
|
140
83
|
selectionMatch = '#e1dbca90', // Selection match with opacity
|
|
141
|
-
|
|
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
|
|
84
|
+
activeBracketBg = '#93a1a140'; // Active bracket background with opacity
|
|
146
85
|
// Diff/merge specific colors
|
|
147
86
|
const addedBackground = '#85990020', // Solarized green with transparency for insertions
|
|
148
|
-
removedBackground = '#dc322f20'
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
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,
|
|
191
|
-
},
|
|
192
|
-
},
|
|
193
|
-
'.cm-searchMatch.cm-searchMatch-selected': {
|
|
194
|
-
backgroundColor: base0E,
|
|
195
|
-
color: base08,
|
|
196
|
-
padding: generalSearchField.padding,
|
|
197
|
-
'& span': {
|
|
198
|
-
color: base08,
|
|
87
|
+
removedBackground = '#dc322f20'; // Solarized red with transparency for deletions
|
|
88
|
+
const theme = codemirrorThemeCore.defineTheme({
|
|
89
|
+
name: 'Solarized Light',
|
|
90
|
+
dark: false,
|
|
91
|
+
ui: {
|
|
92
|
+
background: base07,
|
|
93
|
+
foreground: base00,
|
|
94
|
+
border: 'none',
|
|
95
|
+
cursor: base01,
|
|
96
|
+
cursorWidth: '2px',
|
|
97
|
+
cursorShadow: 'none',
|
|
98
|
+
fatCursor: { background: `${base01}99`, border: 'none' },
|
|
99
|
+
selection: '#fed996',
|
|
100
|
+
selectionInactive: '#fed996',
|
|
101
|
+
selectionForeground: null,
|
|
102
|
+
selectionOutline: 'none',
|
|
103
|
+
activeLine: base06,
|
|
104
|
+
activeLineBorder: { left: 'none', right: 'none' },
|
|
105
|
+
ghostText: base01,
|
|
106
|
+
ghostTextOpacity: '0.5',
|
|
107
|
+
specialChar: base09,
|
|
108
|
+
focusRing: `0 0 0 2px ${base07}, 0 0 0 4px ${base0E}`,
|
|
109
|
+
outlineWidth: '1px',
|
|
110
|
+
searchMatch: {
|
|
111
|
+
background: `${base05}80`,
|
|
112
|
+
outline: base0E,
|
|
113
|
+
foreground: base01,
|
|
114
|
+
shadow: 'none',
|
|
115
|
+
selectedBackground: base0E,
|
|
116
|
+
selectedForeground: base08,
|
|
117
|
+
selectedOutline: `1px solid ${base0E}`,
|
|
118
|
+
selectedShadow: 'none',
|
|
199
119
|
},
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
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',
|
|
120
|
+
selectionMatch: { background: selectionMatch, outline: `${base05}50` },
|
|
121
|
+
matchingBracket: { background: activeBracketBg, outline: base0E, shadow: 'none' },
|
|
122
|
+
nonMatchingBracket: { background: `${base09}40`, outline: invalid },
|
|
123
|
+
panel: {
|
|
124
|
+
background: base04,
|
|
125
|
+
foreground: base00,
|
|
126
|
+
border: base04,
|
|
127
|
+
borderWidth: '1px',
|
|
128
|
+
outline: 'none',
|
|
129
|
+
shadow: 'none',
|
|
130
|
+
buttonBackground: tooltipBackground,
|
|
131
|
+
buttonForeground: base00,
|
|
132
|
+
buttonBorder: 'none',
|
|
133
|
+
buttonHoverBackground: base06,
|
|
134
|
+
buttonHoverForeground: base00,
|
|
135
|
+
buttonHoverBorder: 'none',
|
|
136
|
+
buttonHoverShadow: 'none',
|
|
137
|
+
inputBackground: base07,
|
|
138
|
+
inputBorder: `1px solid ${base04}`,
|
|
313
139
|
},
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
140
|
+
gutter: {
|
|
141
|
+
background: base04,
|
|
142
|
+
foreground: base01,
|
|
143
|
+
border: base04,
|
|
144
|
+
activeBackground: base06,
|
|
145
|
+
activeForeground: base00,
|
|
146
|
+
activeFontWeight: '500',
|
|
147
|
+
activeBorder: 'none',
|
|
148
|
+
foldHover: base00,
|
|
317
149
|
},
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
|
|
150
|
+
foldPlaceholder: {
|
|
151
|
+
background: tooltipBackground,
|
|
152
|
+
foreground: base03,
|
|
153
|
+
border: `${base05}70`,
|
|
154
|
+
borderStyle: 'dotted',
|
|
322
155
|
},
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
156
|
+
tooltip: {
|
|
157
|
+
background: tooltipBackground,
|
|
158
|
+
foreground: base00,
|
|
159
|
+
border: base01,
|
|
160
|
+
shadow: '0 2px 8px rgba(0, 0, 0, 0.15)',
|
|
161
|
+
listBackground: tooltipBackground,
|
|
162
|
+
listBorder: 'none',
|
|
163
|
+
hoverBackground: 'transparent',
|
|
164
|
+
selectedBackground: selection,
|
|
165
|
+
selectedForeground: base01,
|
|
166
|
+
selectedBorder: 'none',
|
|
167
|
+
icon: base01,
|
|
168
|
+
detail: base01,
|
|
326
169
|
},
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
170
|
+
diff: {
|
|
171
|
+
insertedBackground: addedBackground,
|
|
172
|
+
insertedForeground: base0C,
|
|
173
|
+
insertedBorder: `1px solid ${base0C}40`,
|
|
174
|
+
deletedBackground: removedBackground,
|
|
175
|
+
deletedForeground: base09,
|
|
176
|
+
deletedBorder: `1px solid ${base09}40`,
|
|
330
177
|
},
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
|
|
336
|
-
|
|
337
|
-
|
|
338
|
-
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
'.cm-diagnostic': {
|
|
342
|
-
'&-error': {
|
|
343
|
-
borderLeft: `3px solid ${base09}`,
|
|
178
|
+
diagnostic: {
|
|
179
|
+
error: base09,
|
|
180
|
+
warning: base0B,
|
|
181
|
+
info: base0E,
|
|
182
|
+
hint: base0E,
|
|
183
|
+
errorBackground: 'transparent',
|
|
184
|
+
warningBackground: 'transparent',
|
|
185
|
+
infoBackground: 'transparent',
|
|
186
|
+
borderWidth: '3px',
|
|
187
|
+
underlineWidth: '2px',
|
|
344
188
|
},
|
|
345
|
-
|
|
346
|
-
|
|
189
|
+
scrollbar: {
|
|
190
|
+
track: base04,
|
|
191
|
+
trackBorder: 'none',
|
|
192
|
+
thumb: base04,
|
|
193
|
+
thumbBorder: `3px solid ${base04}`,
|
|
194
|
+
thumbHover: base05,
|
|
195
|
+
thumbHoverShadow: 'none',
|
|
347
196
|
},
|
|
348
|
-
|
|
349
|
-
|
|
197
|
+
merge: {
|
|
198
|
+
backgroundColor: base04,
|
|
199
|
+
borderColor: base02,
|
|
200
|
+
buttonColor: base0D,
|
|
201
|
+
buttonHoverColor: activeBracketBg,
|
|
350
202
|
},
|
|
351
203
|
},
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
|
|
363
|
-
|
|
364
|
-
|
|
365
|
-
|
|
366
|
-
|
|
367
|
-
|
|
368
|
-
|
|
369
|
-
|
|
370
|
-
|
|
371
|
-
|
|
372
|
-
|
|
373
|
-
|
|
374
|
-
|
|
375
|
-
|
|
376
|
-
|
|
377
|
-
|
|
378
|
-
color:
|
|
379
|
-
|
|
380
|
-
|
|
381
|
-
|
|
382
|
-
|
|
383
|
-
|
|
384
|
-
|
|
385
|
-
|
|
386
|
-
|
|
387
|
-
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
|
|
395
|
-
|
|
396
|
-
|
|
397
|
-
|
|
398
|
-
|
|
399
|
-
|
|
400
|
-
|
|
401
|
-
|
|
402
|
-
|
|
403
|
-
|
|
404
|
-
|
|
405
|
-
|
|
406
|
-
|
|
407
|
-
|
|
408
|
-
|
|
409
|
-
|
|
410
|
-
|
|
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}`,
|
|
204
|
+
syntax: {
|
|
205
|
+
keyword: { color: base0C, fontWeight: 'bold' },
|
|
206
|
+
definitionKeyword: { color: base0C },
|
|
207
|
+
modifier: { color: base10, fontStyle: 'italic' },
|
|
208
|
+
separator: { color: base0D },
|
|
209
|
+
operator: { color: base0F },
|
|
210
|
+
punctuation: { color: base01 },
|
|
211
|
+
bracket: { color: base10 },
|
|
212
|
+
angleBracket: { color: base01 },
|
|
213
|
+
squareBracket: { color: base09 },
|
|
214
|
+
name: { color: base0D },
|
|
215
|
+
variable: { color: base00 },
|
|
216
|
+
localVariable: { color: base0D },
|
|
217
|
+
variableDefinition: { color: base0D },
|
|
218
|
+
function: { color: base0E },
|
|
219
|
+
self: { color: base10 },
|
|
220
|
+
label: { color: base10 },
|
|
221
|
+
property: { color: base0D, fontStyle: 'normal' },
|
|
222
|
+
type: { color: base0A },
|
|
223
|
+
typeDefinition: { color: base0A, fontWeight: 'bold' },
|
|
224
|
+
className: { color: base0A, fontStyle: 'italic' },
|
|
225
|
+
namespace: { color: base10, fontStyle: 'italic' },
|
|
226
|
+
tag: { color: base0E },
|
|
227
|
+
attribute: { color: base00 },
|
|
228
|
+
content: { color: base00 },
|
|
229
|
+
string: { color: base0B },
|
|
230
|
+
regexp: { color: invalid },
|
|
231
|
+
constantName: { color: base0B },
|
|
232
|
+
standardName: { color: base0B },
|
|
233
|
+
number: { color: base10 },
|
|
234
|
+
constant: { color: base10 },
|
|
235
|
+
comment: { fontStyle: 'italic', color: base01 },
|
|
236
|
+
meta: { color: base09 },
|
|
237
|
+
processingInstruction: { color: base0C },
|
|
238
|
+
annotation: { color: invalid, fontStyle: 'italic' },
|
|
239
|
+
heading: { fontWeight: 'bold', color: base0B },
|
|
240
|
+
headingLevel: { color: base02 },
|
|
241
|
+
heading1: { color: base03 },
|
|
242
|
+
list: { color: base0B },
|
|
243
|
+
quote: { color: base0C },
|
|
244
|
+
monospace: { color: base00 },
|
|
245
|
+
contentSeparator: { color: base0B },
|
|
246
|
+
link: {
|
|
247
|
+
color: base0D,
|
|
248
|
+
fontWeight: '500',
|
|
249
|
+
textDecoration: 'underline',
|
|
250
|
+
textUnderlinePosition: 'under',
|
|
251
|
+
},
|
|
252
|
+
url: { color: base0B, textDecoration: 'underline', textUnderlineOffset: '2px' },
|
|
253
|
+
emphasis: { fontStyle: 'italic', color: base0C },
|
|
254
|
+
strong: { fontWeight: 'bold', color: base02 },
|
|
255
|
+
strikethrough: { color: invalid, textDecoration: 'line-through' },
|
|
256
|
+
invalid: {
|
|
257
|
+
color: base01,
|
|
258
|
+
textDecoration: 'underline wavy',
|
|
259
|
+
borderBottom: `1px dotted ${base09}`,
|
|
260
|
+
},
|
|
261
|
+
inserted: { color: base0C },
|
|
262
|
+
deleted: { color: base09 },
|
|
263
|
+
changed: { color: base10 },
|
|
492
264
|
},
|
|
493
|
-
|
|
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
|
-
{ tag: highlight.tags.integer, color: base10 },
|
|
504
|
-
{ tag: highlight.tags.float, color: base10 },
|
|
505
|
-
{ tag: highlight.tags.null, color: base10 },
|
|
506
|
-
{ tag: highlight.tags.attributeValue, color: base0B },
|
|
507
|
-
{ tag: highlight.tags.escape, color: base0B },
|
|
508
|
-
{ tag: highlight.tags.paren, color: base10 },
|
|
509
|
-
{ tag: highlight.tags.lineComment, color: base01, fontStyle: 'italic' },
|
|
510
|
-
{ tag: highlight.tags.blockComment, color: base01, fontStyle: 'italic' },
|
|
511
|
-
{ tag: highlight.tags.definitionKeyword, color: base0C },
|
|
512
|
-
{ tag: highlight.tags.arithmeticOperator, color: base0F },
|
|
513
|
-
{ tag: highlight.tags.logicOperator, color: base0F },
|
|
514
|
-
{ tag: highlight.tags.compareOperator, color: base0F },
|
|
515
|
-
{ tag: highlight.tags.bitwiseOperator, color: base0F },
|
|
516
|
-
{ tag: highlight.tags.updateOperator, color: base0F },
|
|
517
|
-
{ tag: highlight.tags.derefOperator, color: base0F },
|
|
518
|
-
{ tag: highlight.tags.local(highlight.tags.variableName), color: base0D },
|
|
519
|
-
{ tag: highlight.tags.list, color: base0B },
|
|
520
|
-
{ tag: highlight.tags.unit, color: base10 },
|
|
521
|
-
]);
|
|
265
|
+
});
|
|
522
266
|
/**
|
|
523
267
|
* Combined Solarized Light theme extension
|
|
524
268
|
*/
|
|
525
|
-
const solarizedLight =
|
|
269
|
+
const solarizedLight = theme.extension;
|
|
526
270
|
/**
|
|
527
271
|
* Solarized Light merge revert styles configuration
|
|
528
272
|
*/
|
|
529
|
-
const solarizedLightMergeStyles =
|
|
530
|
-
backgroundColor: base04,
|
|
531
|
-
borderColor: base02,
|
|
532
|
-
buttonColor: base0D,
|
|
533
|
-
buttonHoverColor: `${base05}40`,
|
|
534
|
-
};
|
|
273
|
+
const solarizedLightMergeStyles = theme.mergeStyles;
|
|
535
274
|
|
|
536
275
|
exports.applyMergeRevertStyles = applyMergeRevertStyles;
|
|
537
276
|
exports.solarizedLight = solarizedLight;
|