@fsegurai/codemirror-theme-solarized-light 6.1.4 → 6.2.0-beta

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 CHANGED
@@ -1,5 +1,5 @@
1
1
  <p align="center">
2
- <img alt="CodeMirror 6 Themes Logo" src="https://raw.githubusercontent.com/fsegurai/codemirror-themes/main/demo/public/codemirror-themes.png">
2
+ <img alt="CodeMirror 6 Themes Logo" src="https://raw.githubusercontent.com/fsegurai/codemirror-themes/main/public/codemirror-themes.png">
3
3
  </p>
4
4
 
5
5
  <p align="center">
@@ -69,32 +69,32 @@ Read the [CodeMirror documentation](https://codemirror.net/6/examples/styling/)
69
69
 
70
70
  ### Available Themes
71
71
 
72
- - [All - Bundle](./packages/bundle)
73
- - [Abcdef](./packages/abcdef)
74
- - [Abyss](./packages/abyss)
75
- - [Android Studio](./packages/android-studio)
76
- - [Andromeda](./packages/andromeda)
77
- - [Basic Dark](./packages/basic-dark)
78
- - [Basic Light](./packages/basic-light)
79
- - [Forest](./packages/forest)
80
- - [GitHub Dark](./packages/github-dark)
81
- - [GitHub Light](./packages/github-light)
82
- - [Gruvbox Dark](./packages/gruvbox-dark)
83
- - [Gruvbox Light](./packages/gruvbox-light)
84
- - [Material Dark](./packages/material-dark)
85
- - [Material Light](./packages/material-light)
86
- - [Monokai](./packages/monokai)
87
- - [Nord](./packages/nord)
88
- - [Palenight](./packages/palenight)
89
- - [Solarized Dark](./packages/solarized-dark)
90
- - [Solarized Light](./packages/solarized-light)
91
- - [Tokyo Night Day](./packages/tokyo-night-day)
92
- - [Tokyo Night Storm](./packages/tokyo-night-storm)
93
- - [Volcano](./packages/volcano)
94
- - [VS Code Dark](./packages/vscode-dark)
95
- - [VS Code Light](./packages/vscode-light)
96
-
97
- For a full list, see the [<code>@fsegurai/codemirror-theme-bundle</code>](https://github.com/fsegurai/codemirror-themes/tree/main/packages/bundle) directory or the online demo.
72
+ | Theme | Package | Version |
73
+ |-------------------|----------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------|
74
+ | All - Bundle | [@fsegurai/codemirror-theme-bundle](https://www.npmjs.com/package/@fsegurai/codemirror-theme-bundle) | ![npm](https://img.shields.io/npm/v/@fsegurai/codemirror-theme-bundle) |
75
+ | Abcdef | [@fsegurai/codemirror-theme-abcdef](https://www.npmjs.com/package/@fsegurai/codemirror-theme-abcdef) | ![npm](https://img.shields.io/npm/v/@fsegurai/codemirror-theme-abcdef) |
76
+ | Abyss | [@fsegurai/codemirror-theme-abyss](https://www.npmjs.com/package/@fsegurai/codemirror-theme-abyss) | ![npm](https://img.shields.io/npm/v/@fsegurai/codemirror-theme-abyss) |
77
+ | Android Studio | [@fsegurai/codemirror-theme-android-studio](https://www.npmjs.com/package/@fsegurai/codemirror-theme-android-studio) | ![npm](https://img.shields.io/npm/v/@fsegurai/codemirror-theme-android-studio) |
78
+ | Andromeda | [@fsegurai/codemirror-theme-andromeda](https://www.npmjs.com/package/@fsegurai/codemirror-theme-andromeda) | ![npm](https://img.shields.io/npm/v/@fsegurai/codemirror-theme-andromeda) |
79
+ | Basic Light | [@fsegurai/codemirror-theme-basic-light](https://www.npmjs.com/package/@fsegurai/codemirror-theme-basic-light) | ![npm](https://img.shields.io/npm/v/@fsegurai/codemirror-theme-basic-light) |
80
+ | Basic Dark | [@fsegurai/codemirror-theme-basic-dark](https://www.npmjs.com/package/@fsegurai/codemirror-theme-basic-dark) | ![npm](https://img.shields.io/npm/v/@fsegurai/codemirror-theme-basic-dark) |
81
+ | Forest | [@fsegurai/codemirror-theme-forest](https://www.npmjs.com/package/@fsegurai/codemirror-theme-forest) | ![npm](https://img.shields.io/npm/v/@fsegurai/codemirror-theme-forest) |
82
+ | GitHub Light | [@fsegurai/codemirror-theme-github-light](https://www.npmjs.com/package/@fsegurai/codemirror-theme-github-light) | ![npm](https://img.shields.io/npm/v/@fsegurai/codemirror-theme-github-light) |
83
+ | GitHub Dark | [@fsegurai/codemirror-theme-github-dark](https://www.npmjs.com/package/@fsegurai/codemirror-theme-github-dark) | ![npm](https://img.shields.io/npm/v/@fsegurai/codemirror-theme-github-dark) |
84
+ | Gruvbox Light | [@fsegurai/codemirror-theme-gruvbox-light](https://www.npmjs.com/package/@fsegurai/codemirror-theme-gruvbox-light) | ![npm](https://img.shields.io/npm/v/@fsegurai/codemirror-theme-gruvbox-light) |
85
+ | Gruvbox Dark | [@fsegurai/codemirror-theme-gruvbox-dark](https://www.npmjs.com/package/@fsegurai/codemirror-theme-gruvbox-dark) | ![npm](https://img.shields.io/npm/v/@fsegurai/codemirror-theme-gruvbox-dark) |
86
+ | Material Light | [@fsegurai/codemirror-theme-material-light](https://www.npmjs.com/package/@fsegurai/codemirror-theme-material-light) | ![npm](https://img.shields.io/npm/v/@fsegurai/codemirror-theme-material-light) |
87
+ | Material Dark | [@fsegurai/codemirror-theme-material-dark](https://www.npmjs.com/package/@fsegurai/codemirror-theme-material-dark) | ![npm](https://img.shields.io/npm/v/@fsegurai/codemirror-theme-material-dark) |
88
+ | Monokai | [@fsegurai/codemirror-theme-monokai](https://www.npmjs.com/package/@fsegurai/codemirror-theme-monokai) | ![npm](https://img.shields.io/npm/v/@fsegurai/codemirror-theme-monokai) |
89
+ | Nord | [@fsegurai/codemirror-theme-nord](https://www.npmjs.com/package/@fsegurai/codemirror-theme-nord) | ![npm](https://img.shields.io/npm/v/@fsegurai/codemirror-theme-nord) |
90
+ | Palenight | [@fsegurai/codemirror-theme-palenight](https://www.npmjs.com/package/@fsegurai/codemirror-theme-palenight) | ![npm](https://img.shields.io/npm/v/@fsegurai/codemirror-theme-palenight) |
91
+ | Solarized Light | [@fsegurai/codemirror-theme-solarized-light](https://www.npmjs.com/package/@fsegurai/codemirror-theme-solarized-light) | ![npm](https://img.shields.io/npm/v/@fsegurai/codemirror-theme-solarized-light) |
92
+ | Solarized Dark | [@fsegurai/codemirror-theme-solarized-dark](https://www.npmjs.com/package/@fsegurai/codemirror-theme-solarized-dark) | ![npm](https://img.shields.io/npm/v/@fsegurai/codemirror-theme-solarized-dark) |
93
+ | Tokyo Night Storm | [@fsegurai/codemirror-theme-tokyo-night-storm](https://www.npmjs.com/package/@fsegurai/codemirror-theme-tokyo-night-storm) | ![npm](https://img.shields.io/npm/v/@fsegurai/codemirror-theme-tokyo-night-storm) |
94
+ | Tokyo Night Day | [@fsegurai/codemirror-theme-tokyo-night-day](https://www.npmjs.com/package/@fsegurai/codemirror-theme-tokyo-night-day) | ![npm](https://img.shields.io/npm/v/@fsegurai/codemirror-theme-tokyo-night-day) |
95
+ | Volcano | [@fsegurai/codemirror-theme-volcano](https://www.npmjs.com/package/@fsegurai/codemirror-theme-volcano) | ![npm](https://img.shields.io/npm/v/@fsegurai/codemirror-theme-volcano) |
96
+ | VS Code Dark | [@fsegurai/codemirror-theme-vscode-dark](https://www.npmjs.com/package/@fsegurai/codemirror-theme-vscode-dark) | ![npm](https://img.shields.io/npm/v/@fsegurai/codemirror-theme-vscode-dark) |
97
+ | VS Code Light | [@fsegurai/codemirror-theme-vscode-light](https://www.npmjs.com/package/@fsegurai/codemirror-theme-vscode-light) | ![npm](https://img.shields.io/npm/v/@fsegurai/codemirror-theme-vscode-light) |
98
98
 
99
99
  ### Demo Application
100
100
 
package/dist/index.cjs CHANGED
@@ -3,54 +3,185 @@
3
3
  var view = require('@codemirror/view');
4
4
  var language = require('@codemirror/language');
5
5
  var highlight = require('@lezer/highlight');
6
+ var _utils = require('@utils');
6
7
 
7
- const base00 = '#657b83', base01 = '#586e75', base02 = '#073642', base03 = '#002b36', base04 = '#dfd9c8', base05 = '#93a1a1', base06 = '#cceeff7a', base07 = '#fdf6e3', base_red = '#dc322f', base_orange = '#cb4b16', base_yellow = '#b58900', base_green = '#859900', base_cyan = '#2aa198', base_blue = '#268bd2', base_violet = '#6c71c4', base_magenta = '#d33682';
8
- const invalid = '#d30102', darkBackground = base04, highlightBackground = base06, background = base07, tooltipBackground = base01, selection = '#ffbc00', cursor = base01;
9
8
  /**
10
- The editor theme styles for Solarized Light.
11
- */
9
+ * Enhanced Solarized Light theme color definitions
10
+ * ---------------------------------------------
11
+ * Colors organized by function with visual color blocks
12
+ */
13
+ // Base colors from Solarized palette
14
+ const base00 = '#657b83'; // Body text/default text color
15
+ const base01 = '#586e75'; // Optional emphasized content
16
+ const base02 = '#073642'; // Background highlights
17
+ const base03 = '#002b36'; // Comments, invisible, line highlighting
18
+ const base04 = '#dfd9c8'; // Dark background tint
19
+ const base05 = '#93a1a1'; // Default foreground/UI text color
20
+ const base06 = '#cceeff7a'; // Light background tint (for selection)
21
+ const base07 = '#fdf6e3'; // Background - light base
22
+ const base08 = '#eee8d5'; // Background tint - light secondary
23
+ // Accent colors from Solarized palette
24
+ const base_red = '#dc322f'; // Red
25
+ const base_orange = '#cb4b16'; // Orange
26
+ const base_yellow = '#b58900'; // Yellow
27
+ const base_green = '#859900'; // Green
28
+ const base_cyan = '#2aa198'; // Cyan
29
+ const base_blue = '#268bd2'; // Blue
30
+ const base_violet = '#6c71c4'; // Violet
31
+ const base_magenta = '#d33682'; // Magenta
32
+ // UI specific colors
33
+ const invalid = '#d30102'; // Bright red for errors
34
+ const darkBackground = base04; // Darker background for panels
35
+ const highlightBackground = base06; // Active line highlight
36
+ const background = base07; // Main editor background
37
+ const tooltipBackground = '#f0e9d7'; // Tooltip background
38
+ const selection = '#ffd07a'; // Selection background
39
+ const selectionMatch = '#e1dbca90'; // Selection match with opacity
40
+ const cursor = base01; // Cursor color
41
+ const activeBracketBg = '#93a1a140'; // Active bracket background with opacity
42
+ const activeBracketBorder = base_blue; // Active bracket border - blue
43
+ const diagnosticWarning = base_yellow; // Warning color - yellow
44
+ const linkColor = base_blue; // Link color - blue
45
+ // const visitedLinkColor = base_violet; // Visited link color - violet
46
+ /**
47
+ * Enhanced editor theme styles for Solarized Light
48
+ */
12
49
  const solarizedLightTheme = view.EditorView.theme({
50
+ // Base editor styles
13
51
  '&': {
14
52
  color: base00,
15
53
  backgroundColor: background,
54
+ fontSize: _utils.generalContent.fontSize,
55
+ fontFamily: _utils.generalContent.fontFamily,
16
56
  },
57
+ // Content and cursor
17
58
  '.cm-content': {
18
59
  caretColor: cursor,
60
+ lineHeight: _utils.generalContent.lineHeight,
61
+ },
62
+ '.cm-cursor, .cm-dropCursor': {
63
+ borderLeftColor: cursor,
64
+ borderLeftWidth: _utils.generalCursor.borderLeftWidth,
65
+ },
66
+ '.cm-fat-cursor': {
67
+ backgroundColor: `${cursor}99`,
68
+ color: background,
69
+ },
70
+ // Selection
71
+ '&.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection': {
72
+ backgroundColor: selection,
73
+ },
74
+ // Make sure selection appears above active line
75
+ '.cm-selectionLayer': {
76
+ zIndex: 100,
19
77
  },
20
- '.cm-cursor, .cm-dropCursor': { borderLeftColor: cursor },
21
- '&.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection': { backgroundColor: selection },
22
- '.cm-panels': { backgroundColor: darkBackground, color: base03 },
23
- '.cm-panels.cm-panels-top': { borderBottom: '2px solid black' },
24
- '.cm-panels.cm-panels-bottom': { borderTop: '2px solid black' },
78
+ // Search functionality
25
79
  '.cm-searchMatch': {
26
- backgroundColor: '#72a1ff59',
27
- outline: '1px solid #457dff',
80
+ backgroundColor: '#93a1a180',
81
+ outline: `1px solid ${base_blue}`,
82
+ color: base01,
83
+ borderRadius: _utils.generalSearchField.borderRadius,
84
+ '& span': {
85
+ color: base01,
86
+ },
28
87
  },
29
88
  '.cm-searchMatch.cm-searchMatch-selected': {
30
- backgroundColor: selection,
31
- color: '#000000',
89
+ backgroundColor: base_blue,
90
+ color: base08,
91
+ padding: _utils.generalSearchField.padding,
92
+ '& span': {
93
+ color: base08,
94
+ },
32
95
  },
33
- '.cm-activeLine': { backgroundColor: highlightBackground },
34
- '.cm-selectionMatch': { backgroundColor: '#aafe66' },
35
- '&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket': {
36
- outline: `1px solid ${base05}`,
96
+ '.cm-search.cm-panel.cm-textfield': {
97
+ color: base00,
98
+ borderRadius: _utils.generalSearchField.borderRadius,
99
+ padding: _utils.generalSearchField.padding,
37
100
  },
38
- '.cm-gutters': {
39
- backgroundColor: '#00000010',
101
+ // Panels
102
+ '.cm-panels': {
103
+ backgroundColor: darkBackground,
40
104
  color: base00,
41
- border: 'none',
105
+ borderRadius: '4px',
106
+ },
107
+ '.cm-panels.cm-panels-top': {
108
+ borderBottom: `1px solid ${base04}`,
109
+ },
110
+ '.cm-panels.cm-panels-bottom': {
111
+ borderTop: `1px solid ${base04}`,
112
+ },
113
+ '.cm-panel button': {
114
+ backgroundColor: tooltipBackground,
115
+ color: base00,
116
+ border: _utils.generalPanel.border,
117
+ borderRadius: _utils.generalPanel.borderRadius,
118
+ padding: _utils.generalPanel.padding,
119
+ },
120
+ '.cm-panel button:hover': {
121
+ backgroundColor: highlightBackground,
122
+ },
123
+ // Line highlighting
124
+ '.cm-activeLine': {
125
+ backgroundColor: highlightBackground,
126
+ borderRadius: _utils.generalLine.borderRadius,
127
+ zIndex: 1,
128
+ },
129
+ // Gutters
130
+ '.cm-gutters': {
131
+ backgroundColor: darkBackground,
132
+ color: base01,
133
+ border: _utils.generalGutter.border,
134
+ borderRight: `1px solid ${base04}`,
135
+ paddingRight: _utils.generalGutter.paddingRight,
42
136
  },
43
137
  '.cm-activeLineGutter': {
44
- backgroundColor: selection,
138
+ backgroundColor: highlightBackground,
139
+ color: base00,
140
+ fontWeight: _utils.generalGutter.fontWeight,
45
141
  },
46
- '.cm-foldPlaceholder': {
47
- backgroundColor: 'transparent',
48
- border: 'none',
49
- color: '#ddd',
142
+ '.cm-lineNumbers': {
143
+ fontSize: _utils.generalGutter.fontSize,
144
+ },
145
+ '.cm-foldGutter': {
146
+ fontSize: _utils.generalGutter.fontSize,
147
+ },
148
+ '.cm-foldGutter .cm-gutterElement': {
149
+ color: base01,
150
+ cursor: 'pointer',
50
151
  },
152
+ '.cm-foldGutter .cm-gutterElement:hover': {
153
+ color: base00,
154
+ },
155
+ // Tooltips and autocomplete
51
156
  '.cm-tooltip': {
52
- border: 'none',
53
157
  backgroundColor: tooltipBackground,
158
+ border: `1px solid ${base01}`,
159
+ borderRadius: _utils.generalTooltip.borderRadius,
160
+ padding: _utils.generalTooltip.padding,
161
+ boxShadow: '0 2px 8px rgba(0, 0, 0, 0.15)',
162
+ },
163
+ '.cm-tooltip-autocomplete': {
164
+ '& > ul': {
165
+ backgroundColor: tooltipBackground,
166
+ border: 'none',
167
+ },
168
+ '& > ul > li': {
169
+ padding: _utils.generalTooltip.padding,
170
+ lineHeight: _utils.generalTooltip.lineHeight,
171
+ },
172
+ '& > ul > li[aria-selected]': {
173
+ backgroundColor: selection,
174
+ color: base01,
175
+ borderRadius: _utils.generalTooltip.borderRadiusSelected,
176
+ },
177
+ '& > ul > li > span.cm-completionIcon': {
178
+ color: base01,
179
+ paddingRight: _utils.generalTooltip.paddingRight,
180
+ },
181
+ '& > ul > li > span.cm-completionDetail': {
182
+ color: base01,
183
+ fontStyle: 'italic',
184
+ },
54
185
  },
55
186
  '.cm-tooltip .cm-tooltip-arrow:before': {
56
187
  borderTopColor: 'transparent',
@@ -60,113 +191,173 @@ const solarizedLightTheme = view.EditorView.theme({
60
191
  borderTopColor: tooltipBackground,
61
192
  borderBottomColor: tooltipBackground,
62
193
  },
63
- '.cm-tooltip-autocomplete': {
64
- '& > ul > li[aria-selected]': {
65
- backgroundColor: highlightBackground,
66
- color: base03,
194
+ // Diagnostics styling
195
+ '.cm-diagnostic': {
196
+ '&-error': {
197
+ borderLeft: `3px solid ${base_red}`,
198
+ },
199
+ '&-warning': {
200
+ borderLeft: `3px solid ${diagnosticWarning}`,
201
+ },
202
+ '&-info': {
203
+ borderLeft: `3px solid ${linkColor}`,
67
204
  },
68
205
  },
69
- }, { dark: false });
70
- /**
71
- The highlighting style for code in the Solarized Light theme.
72
- */
73
- const solarizedLightHighlightStyle = language.HighlightStyle.define([
74
- { tag: highlight.tags.keyword, color: base_green },
75
- {
76
- tag: [highlight.tags.name, highlight.tags.deleted, highlight.tags.character, highlight.tags.propertyName, highlight.tags.macroName],
77
- color: base_cyan,
206
+ '.cm-lintPoint-error': {
207
+ borderBottom: `2px wavy ${base_red}`,
78
208
  },
79
- { tag: [highlight.tags.variableName], color: base_blue },
80
- { tag: [highlight.tags.function(highlight.tags.variableName)], color: base_blue },
81
- { tag: [highlight.tags.labelName], color: base_magenta },
82
- {
83
- tag: [highlight.tags.color, highlight.tags.constant(highlight.tags.name), highlight.tags.standard(highlight.tags.name)],
84
- color: base_yellow,
209
+ '.cm-lintPoint-warning': {
210
+ borderBottom: `2px wavy ${diagnosticWarning}`,
85
211
  },
86
- { tag: [highlight.tags.definition(highlight.tags.name), highlight.tags.separator], color: base_cyan },
87
- { tag: [highlight.tags.brace], color: base_magenta },
88
- {
89
- tag: [highlight.tags.annotation],
90
- color: invalid,
212
+ // Matching brackets
213
+ '.cm-matchingBracket': {
214
+ backgroundColor: activeBracketBg,
215
+ outline: `1px solid ${activeBracketBorder}`,
216
+ borderRadius: _utils.generalMatching.borderRadius,
91
217
  },
92
- {
93
- tag: [highlight.tags.number, highlight.tags.changed, highlight.tags.annotation, highlight.tags.modifier, highlight.tags.self, highlight.tags.namespace],
94
- color: base_magenta,
218
+ '.cm-nonmatchingBracket': {
219
+ backgroundColor: `${base_red}40`,
220
+ outline: `1px solid ${invalid}`,
221
+ borderRadius: _utils.generalMatching.borderRadius,
95
222
  },
96
- {
97
- tag: [highlight.tags.typeName, highlight.tags.className],
98
- color: base_orange,
223
+ // Selection matches
224
+ '.cm-selectionMatch': {
225
+ backgroundColor: selectionMatch,
226
+ outline: `1px solid ${base05}50`,
227
+ borderRadius: _utils.generalMatching.borderRadius,
99
228
  },
100
- {
101
- tag: [highlight.tags.operator, highlight.tags.operatorKeyword],
102
- color: base_violet,
229
+ // Fold placeholder
230
+ '.cm-foldPlaceholder': {
231
+ backgroundColor: tooltipBackground,
232
+ color: base03,
233
+ border: `1px dotted ${base05}70`,
234
+ borderRadius: _utils.generalPlaceholder.borderRadius,
235
+ padding: _utils.generalPlaceholder.padding,
236
+ margin: _utils.generalPlaceholder.margin,
103
237
  },
104
- {
105
- tag: [highlight.tags.tagName],
106
- color: base_blue,
238
+ // Focus outline
239
+ '&.cm-focused': {
240
+ outline: 'none',
241
+ boxShadow: `0 0 0 2px ${background}, 0 0 0 3px ${base_blue}40`,
107
242
  },
108
- {
109
- tag: [highlight.tags.squareBracket],
110
- color: base_red,
243
+ // Scrollbars
244
+ '& .cm-scroller::-webkit-scrollbar': {
245
+ width: _utils.generalScroller.width,
246
+ height: _utils.generalScroller.height,
111
247
  },
112
- {
113
- tag: [highlight.tags.angleBracket],
114
- color: base02,
248
+ '& .cm-scroller::-webkit-scrollbar-track': {
249
+ background: darkBackground,
115
250
  },
116
- {
117
- tag: [highlight.tags.attributeName],
118
- color: base05,
251
+ '& .cm-scroller::-webkit-scrollbar-thumb': {
252
+ backgroundColor: base04,
253
+ borderRadius: _utils.generalScroller.borderRadius,
254
+ border: `3px solid ${darkBackground}`,
119
255
  },
120
- {
121
- tag: [highlight.tags.regexp],
122
- color: invalid,
256
+ '& .cm-scroller::-webkit-scrollbar-thumb:hover': {
257
+ backgroundColor: base05,
258
+ },
259
+ // Ghost text
260
+ '.cm-ghostText': {
261
+ opacity: '0.5',
262
+ color: base01,
123
263
  },
264
+ }, { dark: false });
265
+ /**
266
+ * Enhanced syntax highlighting for the Solarized Light theme
267
+ */
268
+ const solarizedLightHighlightStyle = language.HighlightStyle.define([
269
+ // Keywords and control flow
270
+ { tag: highlight.tags.keyword, color: base_green, fontWeight: 'bold' },
271
+ { tag: highlight.tags.controlKeyword, color: base_green, fontWeight: 'bold' },
272
+ { tag: highlight.tags.moduleKeyword, color: base_green, fontWeight: 'bold' },
273
+ // Names and variables
274
+ { tag: [highlight.tags.name, highlight.tags.deleted, highlight.tags.character, highlight.tags.macroName], color: base_cyan },
275
+ { tag: [highlight.tags.variableName], color: base00 },
276
+ { tag: [highlight.tags.propertyName], color: base_cyan, fontStyle: 'normal' },
277
+ // Classes and types
278
+ { tag: [highlight.tags.typeName], color: base_orange },
279
+ { tag: [highlight.tags.className], color: base_orange, fontStyle: 'italic' },
280
+ { tag: [highlight.tags.namespace], color: base_magenta, fontStyle: 'italic' },
281
+ // Operators and punctuation
282
+ { tag: [highlight.tags.operator, highlight.tags.operatorKeyword], color: base_violet },
283
+ { tag: [highlight.tags.bracket], color: base_magenta },
284
+ { tag: [highlight.tags.brace], color: base_magenta },
285
+ { tag: [highlight.tags.punctuation], color: base01 },
286
+ // Functions and parameters
287
+ { tag: [highlight.tags.function(highlight.tags.variableName)], color: base_blue },
288
+ { tag: [highlight.tags.labelName], color: base_magenta },
289
+ { tag: [highlight.tags.definition(highlight.tags.function(highlight.tags.variableName))], color: base_blue },
290
+ { tag: [highlight.tags.definition(highlight.tags.variableName)], color: base_cyan },
291
+ // Constants and literals
292
+ { tag: highlight.tags.number, color: base_magenta },
293
+ { tag: highlight.tags.changed, color: base_magenta },
294
+ { tag: highlight.tags.annotation, color: invalid, fontStyle: 'italic' },
295
+ { tag: highlight.tags.modifier, color: base_magenta, fontStyle: 'italic' },
296
+ { tag: highlight.tags.self, color: base_magenta },
124
297
  {
125
- tag: [highlight.tags.quote],
126
- color: base_green,
298
+ tag: [highlight.tags.color, highlight.tags.constant(highlight.tags.name), highlight.tags.standard(highlight.tags.name)],
299
+ color: base_yellow,
127
300
  },
128
- { tag: [highlight.tags.string], color: base_yellow },
301
+ { tag: [highlight.tags.atom, highlight.tags.bool, highlight.tags.special(highlight.tags.variableName)], color: base_magenta },
302
+ // Strings and regex
303
+ { tag: [highlight.tags.processingInstruction, highlight.tags.inserted], color: base_green },
304
+ { tag: [highlight.tags.special(highlight.tags.string), highlight.tags.regexp], color: invalid },
305
+ { tag: highlight.tags.string, color: base_yellow },
306
+ // Punctuation and structure
307
+ { tag: highlight.tags.definition(highlight.tags.typeName), color: base_orange, fontWeight: 'bold' },
308
+ { tag: [highlight.tags.definition(highlight.tags.name), highlight.tags.separator], color: base_cyan },
309
+ // Comments and documentation
310
+ { tag: highlight.tags.meta, color: base_red },
311
+ { tag: highlight.tags.comment, fontStyle: 'italic', color: base01 },
312
+ { tag: highlight.tags.docComment, fontStyle: 'italic', color: base01 },
313
+ // HTML/XML elements
314
+ { tag: [highlight.tags.tagName], color: base_blue },
315
+ { tag: [highlight.tags.attributeName], color: base00 },
316
+ // Markdown and text formatting
317
+ { tag: [highlight.tags.heading], fontWeight: 'bold', color: base_yellow },
318
+ { tag: highlight.tags.heading1, color: base03 },
319
+ { tag: highlight.tags.heading2, color: base02 },
320
+ { tag: highlight.tags.heading3, color: base02 },
321
+ { tag: highlight.tags.heading4, color: base02 },
322
+ { tag: highlight.tags.heading5, color: base02 },
323
+ { tag: highlight.tags.heading6, color: base02 },
324
+ { tag: [highlight.tags.strong], fontWeight: 'bold', color: base02 },
325
+ { tag: [highlight.tags.emphasis], fontStyle: 'italic', color: base_green },
326
+ // Links and URLs
129
327
  {
130
- tag: highlight.tags.link,
328
+ tag: [highlight.tags.link],
131
329
  color: base_cyan,
330
+ fontWeight: '500',
132
331
  textDecoration: 'underline',
133
332
  textUnderlinePosition: 'under',
134
333
  },
135
334
  {
136
- tag: [highlight.tags.url, highlight.tags.escape, highlight.tags.special(highlight.tags.string)],
335
+ tag: [highlight.tags.url],
137
336
  color: base_yellow,
337
+ textDecoration: 'underline',
338
+ textUnderlineOffset: '2px',
138
339
  },
139
- { tag: [highlight.tags.meta], color: base_red },
140
- { tag: [highlight.tags.comment], color: base02, fontStyle: 'italic' },
141
- { tag: highlight.tags.strong, fontWeight: 'bold', color: base01 },
142
- { tag: highlight.tags.emphasis, fontStyle: 'italic', color: base_green },
143
- { tag: highlight.tags.strikethrough, textDecoration: 'line-through' },
144
- { tag: highlight.tags.heading, fontWeight: 'bold', color: base_yellow },
145
- { tag: highlight.tags.heading1, fontWeight: 'bold', color: base03 },
146
- {
147
- tag: [highlight.tags.heading2, highlight.tags.heading3, highlight.tags.heading4],
148
- fontWeight: 'bold',
149
- color: base03,
150
- },
151
- {
152
- tag: [highlight.tags.heading5, highlight.tags.heading6],
153
- color: base03,
154
- },
155
- { tag: [highlight.tags.atom, highlight.tags.bool, highlight.tags.special(highlight.tags.variableName)], color: base_magenta },
156
- {
157
- tag: [highlight.tags.processingInstruction, highlight.tags.inserted, highlight.tags.contentSeparator],
158
- color: base_red,
159
- },
340
+ // Special states
160
341
  {
161
- tag: [highlight.tags.contentSeparator],
162
- color: base_yellow,
342
+ tag: [highlight.tags.invalid],
343
+ color: base01,
344
+ textDecoration: 'underline wavy',
345
+ borderBottom: `1px dotted ${base_red}`,
163
346
  },
164
- { tag: highlight.tags.invalid, color: base02, borderBottom: `1px dotted ${base_red}` },
347
+ { tag: [highlight.tags.strikethrough], color: invalid, textDecoration: 'line-through' },
348
+ // Enhanced syntax highlighting
349
+ { tag: highlight.tags.constant(highlight.tags.name), color: base_yellow },
350
+ { tag: highlight.tags.deleted, color: base_red },
351
+ { tag: highlight.tags.squareBracket, color: base_red },
352
+ { tag: highlight.tags.angleBracket, color: base01 },
353
+ // Additional specific styles
354
+ { tag: highlight.tags.monospace, color: base00 },
355
+ { tag: [highlight.tags.contentSeparator], color: base_yellow },
356
+ { tag: highlight.tags.quote, color: base_green },
165
357
  ]);
166
358
  /**
167
- Extension to enable the Solarized Light theme (both the editor theme and
168
- the highlight style).
169
- */
359
+ * Combined Solarized Light theme extension
360
+ */
170
361
  const solarizedLight = [
171
362
  solarizedLightTheme,
172
363
  language.syntaxHighlighting(solarizedLightHighlightStyle),
package/dist/index.d.cts CHANGED
@@ -2,17 +2,16 @@ import { Extension } from '@codemirror/state';
2
2
  import { HighlightStyle } from '@codemirror/language';
3
3
 
4
4
  /**
5
- The editor theme styles for Solarized Light.
6
- */
5
+ * Enhanced editor theme styles for Solarized Light
6
+ */
7
7
  declare const solarizedLightTheme: Extension;
8
8
  /**
9
- The highlighting style for code in the Solarized Light theme.
10
- */
9
+ * Enhanced syntax highlighting for the Solarized Light theme
10
+ */
11
11
  declare const solarizedLightHighlightStyle: HighlightStyle;
12
12
  /**
13
- Extension to enable the Solarized Light theme (both the editor theme and
14
- the highlight style).
15
- */
13
+ * Combined Solarized Light theme extension
14
+ */
16
15
  declare const solarizedLight: Extension;
17
16
 
18
17
  export { solarizedLight, solarizedLightHighlightStyle, solarizedLightTheme };
package/dist/index.d.ts CHANGED
@@ -2,17 +2,16 @@ import { Extension } from '@codemirror/state';
2
2
  import { HighlightStyle } from '@codemirror/language';
3
3
 
4
4
  /**
5
- The editor theme styles for Solarized Light.
6
- */
5
+ * Enhanced editor theme styles for Solarized Light
6
+ */
7
7
  declare const solarizedLightTheme: Extension;
8
8
  /**
9
- The highlighting style for code in the Solarized Light theme.
10
- */
9
+ * Enhanced syntax highlighting for the Solarized Light theme
10
+ */
11
11
  declare const solarizedLightHighlightStyle: HighlightStyle;
12
12
  /**
13
- Extension to enable the Solarized Light theme (both the editor theme and
14
- the highlight style).
15
- */
13
+ * Combined Solarized Light theme extension
14
+ */
16
15
  declare const solarizedLight: Extension;
17
16
 
18
17
  export { solarizedLight, solarizedLightHighlightStyle, solarizedLightTheme };
package/dist/index.js CHANGED
@@ -1,54 +1,185 @@
1
1
  import { EditorView } from '@codemirror/view';
2
2
  import { HighlightStyle, syntaxHighlighting } from '@codemirror/language';
3
3
  import { tags } from '@lezer/highlight';
4
+ import { generalScroller, generalPlaceholder, generalMatching, generalTooltip, generalGutter, generalLine, generalPanel, generalSearchField, generalCursor, generalContent } from '@utils';
4
5
 
5
- const base00 = '#657b83', base01 = '#586e75', base02 = '#073642', base03 = '#002b36', base04 = '#dfd9c8', base05 = '#93a1a1', base06 = '#cceeff7a', base07 = '#fdf6e3', base_red = '#dc322f', base_orange = '#cb4b16', base_yellow = '#b58900', base_green = '#859900', base_cyan = '#2aa198', base_blue = '#268bd2', base_violet = '#6c71c4', base_magenta = '#d33682';
6
- const invalid = '#d30102', darkBackground = base04, highlightBackground = base06, background = base07, tooltipBackground = base01, selection = '#ffbc00', cursor = base01;
7
6
  /**
8
- The editor theme styles for Solarized Light.
9
- */
7
+ * Enhanced Solarized Light theme color definitions
8
+ * ---------------------------------------------
9
+ * Colors organized by function with visual color blocks
10
+ */
11
+ // Base colors from Solarized palette
12
+ const base00 = '#657b83'; // Body text/default text color
13
+ const base01 = '#586e75'; // Optional emphasized content
14
+ const base02 = '#073642'; // Background highlights
15
+ const base03 = '#002b36'; // Comments, invisible, line highlighting
16
+ const base04 = '#dfd9c8'; // Dark background tint
17
+ const base05 = '#93a1a1'; // Default foreground/UI text color
18
+ const base06 = '#cceeff7a'; // Light background tint (for selection)
19
+ const base07 = '#fdf6e3'; // Background - light base
20
+ const base08 = '#eee8d5'; // Background tint - light secondary
21
+ // Accent colors from Solarized palette
22
+ const base_red = '#dc322f'; // Red
23
+ const base_orange = '#cb4b16'; // Orange
24
+ const base_yellow = '#b58900'; // Yellow
25
+ const base_green = '#859900'; // Green
26
+ const base_cyan = '#2aa198'; // Cyan
27
+ const base_blue = '#268bd2'; // Blue
28
+ const base_violet = '#6c71c4'; // Violet
29
+ const base_magenta = '#d33682'; // Magenta
30
+ // UI specific colors
31
+ const invalid = '#d30102'; // Bright red for errors
32
+ const darkBackground = base04; // Darker background for panels
33
+ const highlightBackground = base06; // Active line highlight
34
+ const background = base07; // Main editor background
35
+ const tooltipBackground = '#f0e9d7'; // Tooltip background
36
+ const selection = '#ffd07a'; // Selection background
37
+ const selectionMatch = '#e1dbca90'; // Selection match with opacity
38
+ const cursor = base01; // Cursor color
39
+ const activeBracketBg = '#93a1a140'; // Active bracket background with opacity
40
+ const activeBracketBorder = base_blue; // Active bracket border - blue
41
+ const diagnosticWarning = base_yellow; // Warning color - yellow
42
+ const linkColor = base_blue; // Link color - blue
43
+ // const visitedLinkColor = base_violet; // Visited link color - violet
44
+ /**
45
+ * Enhanced editor theme styles for Solarized Light
46
+ */
10
47
  const solarizedLightTheme = /*@__PURE__*/EditorView.theme({
48
+ // Base editor styles
11
49
  '&': {
12
50
  color: base00,
13
51
  backgroundColor: background,
52
+ fontSize: generalContent.fontSize,
53
+ fontFamily: generalContent.fontFamily,
14
54
  },
55
+ // Content and cursor
15
56
  '.cm-content': {
16
57
  caretColor: cursor,
58
+ lineHeight: generalContent.lineHeight,
59
+ },
60
+ '.cm-cursor, .cm-dropCursor': {
61
+ borderLeftColor: cursor,
62
+ borderLeftWidth: generalCursor.borderLeftWidth,
63
+ },
64
+ '.cm-fat-cursor': {
65
+ backgroundColor: `${cursor}99`,
66
+ color: background,
67
+ },
68
+ // Selection
69
+ '&.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection': {
70
+ backgroundColor: selection,
71
+ },
72
+ // Make sure selection appears above active line
73
+ '.cm-selectionLayer': {
74
+ zIndex: 100,
17
75
  },
18
- '.cm-cursor, .cm-dropCursor': { borderLeftColor: cursor },
19
- '&.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection': { backgroundColor: selection },
20
- '.cm-panels': { backgroundColor: darkBackground, color: base03 },
21
- '.cm-panels.cm-panels-top': { borderBottom: '2px solid black' },
22
- '.cm-panels.cm-panels-bottom': { borderTop: '2px solid black' },
76
+ // Search functionality
23
77
  '.cm-searchMatch': {
24
- backgroundColor: '#72a1ff59',
25
- outline: '1px solid #457dff',
78
+ backgroundColor: '#93a1a180',
79
+ outline: `1px solid ${base_blue}`,
80
+ color: base01,
81
+ borderRadius: generalSearchField.borderRadius,
82
+ '& span': {
83
+ color: base01,
84
+ },
26
85
  },
27
86
  '.cm-searchMatch.cm-searchMatch-selected': {
28
- backgroundColor: selection,
29
- color: '#000000',
87
+ backgroundColor: base_blue,
88
+ color: base08,
89
+ padding: generalSearchField.padding,
90
+ '& span': {
91
+ color: base08,
92
+ },
30
93
  },
31
- '.cm-activeLine': { backgroundColor: highlightBackground },
32
- '.cm-selectionMatch': { backgroundColor: '#aafe66' },
33
- '&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket': {
34
- outline: `1px solid ${base05}`,
94
+ '.cm-search.cm-panel.cm-textfield': {
95
+ color: base00,
96
+ borderRadius: generalSearchField.borderRadius,
97
+ padding: generalSearchField.padding,
35
98
  },
36
- '.cm-gutters': {
37
- backgroundColor: '#00000010',
99
+ // Panels
100
+ '.cm-panels': {
101
+ backgroundColor: darkBackground,
38
102
  color: base00,
39
- border: 'none',
103
+ borderRadius: '4px',
104
+ },
105
+ '.cm-panels.cm-panels-top': {
106
+ borderBottom: `1px solid ${base04}`,
107
+ },
108
+ '.cm-panels.cm-panels-bottom': {
109
+ borderTop: `1px solid ${base04}`,
110
+ },
111
+ '.cm-panel button': {
112
+ backgroundColor: tooltipBackground,
113
+ color: base00,
114
+ border: generalPanel.border,
115
+ borderRadius: generalPanel.borderRadius,
116
+ padding: generalPanel.padding,
117
+ },
118
+ '.cm-panel button:hover': {
119
+ backgroundColor: highlightBackground,
120
+ },
121
+ // Line highlighting
122
+ '.cm-activeLine': {
123
+ backgroundColor: highlightBackground,
124
+ borderRadius: generalLine.borderRadius,
125
+ zIndex: 1,
126
+ },
127
+ // Gutters
128
+ '.cm-gutters': {
129
+ backgroundColor: darkBackground,
130
+ color: base01,
131
+ border: generalGutter.border,
132
+ borderRight: `1px solid ${base04}`,
133
+ paddingRight: generalGutter.paddingRight,
40
134
  },
41
135
  '.cm-activeLineGutter': {
42
- backgroundColor: selection,
136
+ backgroundColor: highlightBackground,
137
+ color: base00,
138
+ fontWeight: generalGutter.fontWeight,
43
139
  },
44
- '.cm-foldPlaceholder': {
45
- backgroundColor: 'transparent',
46
- border: 'none',
47
- color: '#ddd',
140
+ '.cm-lineNumbers': {
141
+ fontSize: generalGutter.fontSize,
142
+ },
143
+ '.cm-foldGutter': {
144
+ fontSize: generalGutter.fontSize,
145
+ },
146
+ '.cm-foldGutter .cm-gutterElement': {
147
+ color: base01,
148
+ cursor: 'pointer',
48
149
  },
150
+ '.cm-foldGutter .cm-gutterElement:hover': {
151
+ color: base00,
152
+ },
153
+ // Tooltips and autocomplete
49
154
  '.cm-tooltip': {
50
- border: 'none',
51
155
  backgroundColor: tooltipBackground,
156
+ border: `1px solid ${base01}`,
157
+ borderRadius: generalTooltip.borderRadius,
158
+ padding: generalTooltip.padding,
159
+ boxShadow: '0 2px 8px rgba(0, 0, 0, 0.15)',
160
+ },
161
+ '.cm-tooltip-autocomplete': {
162
+ '& > ul': {
163
+ backgroundColor: tooltipBackground,
164
+ border: 'none',
165
+ },
166
+ '& > ul > li': {
167
+ padding: generalTooltip.padding,
168
+ lineHeight: generalTooltip.lineHeight,
169
+ },
170
+ '& > ul > li[aria-selected]': {
171
+ backgroundColor: selection,
172
+ color: base01,
173
+ borderRadius: generalTooltip.borderRadiusSelected,
174
+ },
175
+ '& > ul > li > span.cm-completionIcon': {
176
+ color: base01,
177
+ paddingRight: generalTooltip.paddingRight,
178
+ },
179
+ '& > ul > li > span.cm-completionDetail': {
180
+ color: base01,
181
+ fontStyle: 'italic',
182
+ },
52
183
  },
53
184
  '.cm-tooltip .cm-tooltip-arrow:before': {
54
185
  borderTopColor: 'transparent',
@@ -58,113 +189,173 @@ const solarizedLightTheme = /*@__PURE__*/EditorView.theme({
58
189
  borderTopColor: tooltipBackground,
59
190
  borderBottomColor: tooltipBackground,
60
191
  },
61
- '.cm-tooltip-autocomplete': {
62
- '& > ul > li[aria-selected]': {
63
- backgroundColor: highlightBackground,
64
- color: base03,
192
+ // Diagnostics styling
193
+ '.cm-diagnostic': {
194
+ '&-error': {
195
+ borderLeft: `3px solid ${base_red}`,
196
+ },
197
+ '&-warning': {
198
+ borderLeft: `3px solid ${diagnosticWarning}`,
199
+ },
200
+ '&-info': {
201
+ borderLeft: `3px solid ${linkColor}`,
65
202
  },
66
203
  },
67
- }, { dark: false });
68
- /**
69
- The highlighting style for code in the Solarized Light theme.
70
- */
71
- const solarizedLightHighlightStyle = /*@__PURE__*/HighlightStyle.define([
72
- { tag: tags.keyword, color: base_green },
73
- {
74
- tag: [tags.name, tags.deleted, tags.character, tags.propertyName, tags.macroName],
75
- color: base_cyan,
204
+ '.cm-lintPoint-error': {
205
+ borderBottom: `2px wavy ${base_red}`,
76
206
  },
77
- { tag: [tags.variableName], color: base_blue },
78
- { tag: [/*@__PURE__*/tags.function(tags.variableName)], color: base_blue },
79
- { tag: [tags.labelName], color: base_magenta },
80
- {
81
- tag: [tags.color, /*@__PURE__*/tags.constant(tags.name), /*@__PURE__*/tags.standard(tags.name)],
82
- color: base_yellow,
207
+ '.cm-lintPoint-warning': {
208
+ borderBottom: `2px wavy ${diagnosticWarning}`,
83
209
  },
84
- { tag: [/*@__PURE__*/tags.definition(tags.name), tags.separator], color: base_cyan },
85
- { tag: [tags.brace], color: base_magenta },
86
- {
87
- tag: [tags.annotation],
88
- color: invalid,
210
+ // Matching brackets
211
+ '.cm-matchingBracket': {
212
+ backgroundColor: activeBracketBg,
213
+ outline: `1px solid ${activeBracketBorder}`,
214
+ borderRadius: generalMatching.borderRadius,
89
215
  },
90
- {
91
- tag: [tags.number, tags.changed, tags.annotation, tags.modifier, tags.self, tags.namespace],
92
- color: base_magenta,
216
+ '.cm-nonmatchingBracket': {
217
+ backgroundColor: `${base_red}40`,
218
+ outline: `1px solid ${invalid}`,
219
+ borderRadius: generalMatching.borderRadius,
93
220
  },
94
- {
95
- tag: [tags.typeName, tags.className],
96
- color: base_orange,
221
+ // Selection matches
222
+ '.cm-selectionMatch': {
223
+ backgroundColor: selectionMatch,
224
+ outline: `1px solid ${base05}50`,
225
+ borderRadius: generalMatching.borderRadius,
97
226
  },
98
- {
99
- tag: [tags.operator, tags.operatorKeyword],
100
- color: base_violet,
227
+ // Fold placeholder
228
+ '.cm-foldPlaceholder': {
229
+ backgroundColor: tooltipBackground,
230
+ color: base03,
231
+ border: `1px dotted ${base05}70`,
232
+ borderRadius: generalPlaceholder.borderRadius,
233
+ padding: generalPlaceholder.padding,
234
+ margin: generalPlaceholder.margin,
101
235
  },
102
- {
103
- tag: [tags.tagName],
104
- color: base_blue,
236
+ // Focus outline
237
+ '&.cm-focused': {
238
+ outline: 'none',
239
+ boxShadow: `0 0 0 2px ${background}, 0 0 0 3px ${base_blue}40`,
105
240
  },
106
- {
107
- tag: [tags.squareBracket],
108
- color: base_red,
241
+ // Scrollbars
242
+ '& .cm-scroller::-webkit-scrollbar': {
243
+ width: generalScroller.width,
244
+ height: generalScroller.height,
109
245
  },
110
- {
111
- tag: [tags.angleBracket],
112
- color: base02,
246
+ '& .cm-scroller::-webkit-scrollbar-track': {
247
+ background: darkBackground,
113
248
  },
114
- {
115
- tag: [tags.attributeName],
116
- color: base05,
249
+ '& .cm-scroller::-webkit-scrollbar-thumb': {
250
+ backgroundColor: base04,
251
+ borderRadius: generalScroller.borderRadius,
252
+ border: `3px solid ${darkBackground}`,
117
253
  },
118
- {
119
- tag: [tags.regexp],
120
- color: invalid,
254
+ '& .cm-scroller::-webkit-scrollbar-thumb:hover': {
255
+ backgroundColor: base05,
256
+ },
257
+ // Ghost text
258
+ '.cm-ghostText': {
259
+ opacity: '0.5',
260
+ color: base01,
121
261
  },
262
+ }, { dark: false });
263
+ /**
264
+ * Enhanced syntax highlighting for the Solarized Light theme
265
+ */
266
+ const solarizedLightHighlightStyle = /*@__PURE__*/HighlightStyle.define([
267
+ // Keywords and control flow
268
+ { tag: tags.keyword, color: base_green, fontWeight: 'bold' },
269
+ { tag: tags.controlKeyword, color: base_green, fontWeight: 'bold' },
270
+ { tag: tags.moduleKeyword, color: base_green, fontWeight: 'bold' },
271
+ // Names and variables
272
+ { tag: [tags.name, tags.deleted, tags.character, tags.macroName], color: base_cyan },
273
+ { tag: [tags.variableName], color: base00 },
274
+ { tag: [tags.propertyName], color: base_cyan, fontStyle: 'normal' },
275
+ // Classes and types
276
+ { tag: [tags.typeName], color: base_orange },
277
+ { tag: [tags.className], color: base_orange, fontStyle: 'italic' },
278
+ { tag: [tags.namespace], color: base_magenta, fontStyle: 'italic' },
279
+ // Operators and punctuation
280
+ { tag: [tags.operator, tags.operatorKeyword], color: base_violet },
281
+ { tag: [tags.bracket], color: base_magenta },
282
+ { tag: [tags.brace], color: base_magenta },
283
+ { tag: [tags.punctuation], color: base01 },
284
+ // Functions and parameters
285
+ { tag: [/*@__PURE__*/tags.function(tags.variableName)], color: base_blue },
286
+ { tag: [tags.labelName], color: base_magenta },
287
+ { tag: [/*@__PURE__*/tags.definition(/*@__PURE__*/tags.function(tags.variableName))], color: base_blue },
288
+ { tag: [/*@__PURE__*/tags.definition(tags.variableName)], color: base_cyan },
289
+ // Constants and literals
290
+ { tag: tags.number, color: base_magenta },
291
+ { tag: tags.changed, color: base_magenta },
292
+ { tag: tags.annotation, color: invalid, fontStyle: 'italic' },
293
+ { tag: tags.modifier, color: base_magenta, fontStyle: 'italic' },
294
+ { tag: tags.self, color: base_magenta },
122
295
  {
123
- tag: [tags.quote],
124
- color: base_green,
296
+ tag: [tags.color, /*@__PURE__*/tags.constant(tags.name), /*@__PURE__*/tags.standard(tags.name)],
297
+ color: base_yellow,
125
298
  },
126
- { tag: [tags.string], color: base_yellow },
299
+ { tag: [tags.atom, tags.bool, /*@__PURE__*/tags.special(tags.variableName)], color: base_magenta },
300
+ // Strings and regex
301
+ { tag: [tags.processingInstruction, tags.inserted], color: base_green },
302
+ { tag: [/*@__PURE__*/tags.special(tags.string), tags.regexp], color: invalid },
303
+ { tag: tags.string, color: base_yellow },
304
+ // Punctuation and structure
305
+ { tag: /*@__PURE__*/tags.definition(tags.typeName), color: base_orange, fontWeight: 'bold' },
306
+ { tag: [/*@__PURE__*/tags.definition(tags.name), tags.separator], color: base_cyan },
307
+ // Comments and documentation
308
+ { tag: tags.meta, color: base_red },
309
+ { tag: tags.comment, fontStyle: 'italic', color: base01 },
310
+ { tag: tags.docComment, fontStyle: 'italic', color: base01 },
311
+ // HTML/XML elements
312
+ { tag: [tags.tagName], color: base_blue },
313
+ { tag: [tags.attributeName], color: base00 },
314
+ // Markdown and text formatting
315
+ { tag: [tags.heading], fontWeight: 'bold', color: base_yellow },
316
+ { tag: tags.heading1, color: base03 },
317
+ { tag: tags.heading2, color: base02 },
318
+ { tag: tags.heading3, color: base02 },
319
+ { tag: tags.heading4, color: base02 },
320
+ { tag: tags.heading5, color: base02 },
321
+ { tag: tags.heading6, color: base02 },
322
+ { tag: [tags.strong], fontWeight: 'bold', color: base02 },
323
+ { tag: [tags.emphasis], fontStyle: 'italic', color: base_green },
324
+ // Links and URLs
127
325
  {
128
- tag: tags.link,
326
+ tag: [tags.link],
129
327
  color: base_cyan,
328
+ fontWeight: '500',
130
329
  textDecoration: 'underline',
131
330
  textUnderlinePosition: 'under',
132
331
  },
133
332
  {
134
- tag: [tags.url, tags.escape, /*@__PURE__*/tags.special(tags.string)],
333
+ tag: [tags.url],
135
334
  color: base_yellow,
335
+ textDecoration: 'underline',
336
+ textUnderlineOffset: '2px',
136
337
  },
137
- { tag: [tags.meta], color: base_red },
138
- { tag: [tags.comment], color: base02, fontStyle: 'italic' },
139
- { tag: tags.strong, fontWeight: 'bold', color: base01 },
140
- { tag: tags.emphasis, fontStyle: 'italic', color: base_green },
141
- { tag: tags.strikethrough, textDecoration: 'line-through' },
142
- { tag: tags.heading, fontWeight: 'bold', color: base_yellow },
143
- { tag: tags.heading1, fontWeight: 'bold', color: base03 },
144
- {
145
- tag: [tags.heading2, tags.heading3, tags.heading4],
146
- fontWeight: 'bold',
147
- color: base03,
148
- },
149
- {
150
- tag: [tags.heading5, tags.heading6],
151
- color: base03,
152
- },
153
- { tag: [tags.atom, tags.bool, /*@__PURE__*/tags.special(tags.variableName)], color: base_magenta },
154
- {
155
- tag: [tags.processingInstruction, tags.inserted, tags.contentSeparator],
156
- color: base_red,
157
- },
338
+ // Special states
158
339
  {
159
- tag: [tags.contentSeparator],
160
- color: base_yellow,
340
+ tag: [tags.invalid],
341
+ color: base01,
342
+ textDecoration: 'underline wavy',
343
+ borderBottom: `1px dotted ${base_red}`,
161
344
  },
162
- { tag: tags.invalid, color: base02, borderBottom: `1px dotted ${base_red}` },
345
+ { tag: [tags.strikethrough], color: invalid, textDecoration: 'line-through' },
346
+ // Enhanced syntax highlighting
347
+ { tag: /*@__PURE__*/tags.constant(tags.name), color: base_yellow },
348
+ { tag: tags.deleted, color: base_red },
349
+ { tag: tags.squareBracket, color: base_red },
350
+ { tag: tags.angleBracket, color: base01 },
351
+ // Additional specific styles
352
+ { tag: tags.monospace, color: base00 },
353
+ { tag: [tags.contentSeparator], color: base_yellow },
354
+ { tag: tags.quote, color: base_green },
163
355
  ]);
164
356
  /**
165
- Extension to enable the Solarized Light theme (both the editor theme and
166
- the highlight style).
167
- */
357
+ * Combined Solarized Light theme extension
358
+ */
168
359
  const solarizedLight = [
169
360
  solarizedLightTheme,
170
361
  /*@__PURE__*/syntaxHighlighting(solarizedLightHighlightStyle),
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@fsegurai/codemirror-theme-solarized-light",
3
3
  "description": "Solarized Light theme for the CodeMirror code editor",
4
- "version": "6.1.4",
4
+ "version": "6.2.0-beta",
5
5
  "type": "module",
6
6
  "main": "dist/index.cjs",
7
7
  "exports": {