Skip to content

Commit b3ee803

Browse files
jaywcjlovejaywcjlove
committed
refactor(theme): optimize code.
1 parent 997700b commit b3ee803

File tree

6 files changed

+160
-160
lines changed

6 files changed

+160
-160
lines changed

‎themes/abyss/src/index.ts‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
import { tags as t } from '@lezer/highlight';
2-
import { createTheme, CreateThemeOptions } from '@uiw/codemirror-themes';
3-
import { config } from './color';
2+
import { createTheme, type CreateThemeOptions } from '@uiw/codemirror-themes';
3+
import { config as c } from './color';
44

55
export const defaultSettingsAbyss: CreateThemeOptions['settings'] = {
6-
background: config.background,
7-
foreground: config.foreground,
8-
caret: config.cursor,
9-
selection: config.selection,
10-
selectionMatch: config.selectionMatch,
11-
gutterBackground: config.background,
12-
gutterForeground: config.foreground,
13-
lineHighlight: config.activeLine,
6+
background: c.background,
7+
foreground: c.foreground,
8+
caret: c.cursor,
9+
selection: c.selection,
10+
selectionMatch: c.selectionMatch,
11+
gutterBackground: c.background,
12+
gutterForeground: c.foreground,
13+
lineHighlight: c.activeLine,
1414
};
1515

1616
export const abyssInit = (options?: Partial<CreateThemeOptions>) => {
@@ -22,26 +22,26 @@ export const abyssInit = (options?: Partial<CreateThemeOptions>) => {
2222
...settings,
2323
},
2424
styles: [
25-
{ tag: t.keyword, color: config.keyword },
26-
{ tag: [t.name, t.deleted, t.character, t.macroName], color: config.variable },
27-
{ tag: [t.propertyName], color: config.function },
28-
{ tag: [t.processingInstruction, t.string, t.inserted, t.special(t.string)], color: config.string },
29-
{ tag: [t.function(t.variableName), t.labelName], color: config.function },
30-
{ tag: [t.color, t.constant(t.name), t.standard(t.name)], color: config.constant },
31-
{ tag: [t.definition(t.name), t.separator], color: config.variable },
32-
{ tag: [t.className], color: config.class },
33-
{ tag: [t.number, t.changed, t.annotation, t.modifier, t.self, t.namespace], color: config.number },
34-
{ tag: [t.typeName], color: config.type, fontStyle: config.type },
35-
{ tag: [t.operator, t.operatorKeyword], color: config.keyword },
36-
{ tag: [t.url, t.escape, t.regexp, t.link], color: config.regexp },
37-
{ tag: [t.meta, t.comment], color: config.comment },
38-
{ tag: t.tagName, color: config.tag },
25+
{ tag: t.keyword, color: c.keyword },
26+
{ tag: [t.name, t.deleted, t.character, t.macroName], color: c.variable },
27+
{ tag: [t.propertyName], color: c.function },
28+
{ tag: [t.processingInstruction, t.string, t.inserted, t.special(t.string)], color: c.string },
29+
{ tag: [t.function(t.variableName), t.labelName], color: c.function },
30+
{ tag: [t.color, t.constant(t.name), t.standard(t.name)], color: c.constant },
31+
{ tag: [t.definition(t.name), t.separator], color: c.variable },
32+
{ tag: [t.className], color: c.class },
33+
{ tag: [t.number, t.changed, t.annotation, t.modifier, t.self, t.namespace], color: c.number },
34+
{ tag: [t.typeName], color: c.type, fontStyle: c.type },
35+
{ tag: [t.operator, t.operatorKeyword], color: c.keyword },
36+
{ tag: [t.url, t.escape, t.regexp, t.link], color: c.regexp },
37+
{ tag: [t.meta, t.comment], color: c.comment },
38+
{ tag: t.tagName, color: c.tag },
3939
{ tag: t.strong, fontWeight: 'bold' },
4040
{ tag: t.emphasis, fontStyle: 'italic' },
4141
{ tag: t.link, textDecoration: 'underline' },
42-
{ tag: t.heading, fontWeight: 'bold', color: config.heading },
43-
{ tag: [t.atom, t.bool, t.special(t.variableName)], color: config.variable },
44-
{ tag: t.invalid, color: config.invalid },
42+
{ tag: t.heading, fontWeight: 'bold', color: c.heading },
43+
{ tag: [t.atom, t.bool, t.special(t.variableName)], color: c.variable },
44+
{ tag: t.invalid, color: c.invalid },
4545
{ tag: t.strikethrough, textDecoration: 'line-through' },
4646
...styles,
4747
],

‎themes/kimbie/src/index.ts‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
import { tags as t } from '@lezer/highlight';
22
import { createTheme, CreateThemeOptions } from '@uiw/codemirror-themes';
3-
import { config } from './color';
3+
import { config as c } from './color';
44

55
export const defaultSettingsKimbie: CreateThemeOptions['settings'] = {
6-
background: config.background,
7-
foreground: config.foreground,
8-
caret: config.cursor,
9-
selection: config.selection,
10-
selectionMatch: config.selection,
11-
gutterBackground: config.background,
12-
gutterForeground: config.foreground,
13-
lineHighlight: config.activeLine,
6+
background: c.background,
7+
foreground: c.foreground,
8+
caret: c.cursor,
9+
selection: c.selection,
10+
selectionMatch: c.selection,
11+
gutterBackground: c.background,
12+
gutterForeground: c.foreground,
13+
lineHighlight: c.activeLine,
1414
};
1515

1616
export const kimbieInit = (options?: Partial<CreateThemeOptions>) => {
@@ -22,26 +22,26 @@ export const kimbieInit = (options?: Partial<CreateThemeOptions>) => {
2222
...settings,
2323
},
2424
styles: [
25-
{ tag: t.keyword, color: config.keyword },
26-
{ tag: [t.name, t.deleted, t.character, t.macroName], color: config.variable },
27-
{ tag: [t.propertyName], color: config.function },
28-
{ tag: [t.processingInstruction, t.string, t.inserted, t.special(t.string)], color: config.string },
29-
{ tag: [t.function(t.variableName), t.labelName], color: config.function },
30-
{ tag: [t.color, t.constant(t.name), t.standard(t.name)], color: config.constant },
31-
{ tag: [t.definition(t.name), t.separator], color: config.variable },
32-
{ tag: [t.className], color: config.class },
33-
{ tag: [t.number, t.changed, t.annotation, t.modifier, t.self, t.namespace], color: config.number },
34-
{ tag: [t.typeName], color: config.type, fontStyle: config.type },
35-
{ tag: [t.operator, t.operatorKeyword], color: config.keyword },
36-
{ tag: [t.url, t.escape, t.regexp, t.link], color: config.regexp },
37-
{ tag: [t.meta, t.comment], color: config.comment },
38-
{ tag: t.tagName, color: config.tag },
25+
{ tag: t.keyword, color: c.keyword },
26+
{ tag: [t.name, t.deleted, t.character, t.macroName], color: c.variable },
27+
{ tag: [t.propertyName], color: c.function },
28+
{ tag: [t.processingInstruction, t.string, t.inserted, t.special(t.string)], color: c.string },
29+
{ tag: [t.function(t.variableName), t.labelName], color: c.function },
30+
{ tag: [t.color, t.constant(t.name), t.standard(t.name)], color: c.constant },
31+
{ tag: [t.definition(t.name), t.separator], color: c.variable },
32+
{ tag: [t.className], color: c.class },
33+
{ tag: [t.number, t.changed, t.annotation, t.modifier, t.self, t.namespace], color: c.number },
34+
{ tag: [t.typeName], color: c.type, fontStyle: c.type },
35+
{ tag: [t.operator, t.operatorKeyword], color: c.keyword },
36+
{ tag: [t.url, t.escape, t.regexp, t.link], color: c.regexp },
37+
{ tag: [t.meta, t.comment], color: c.comment },
38+
{ tag: t.tagName, color: c.tag },
3939
{ tag: t.strong, fontWeight: 'bold' },
4040
{ tag: t.emphasis, fontStyle: 'italic' },
4141
{ tag: t.link, textDecoration: 'underline' },
42-
{ tag: t.heading, fontWeight: 'bold', color: config.heading },
43-
{ tag: [t.atom, t.bool, t.special(t.variableName)], color: config.variable },
44-
{ tag: t.invalid, color: config.invalid },
42+
{ tag: t.heading, fontWeight: 'bold', color: c.heading },
43+
{ tag: [t.atom, t.bool, t.special(t.variableName)], color: c.variable },
44+
{ tag: t.invalid, color: c.invalid },
4545
{ tag: t.strikethrough, textDecoration: 'line-through' },
4646
...styles,
4747
],

‎themes/monokai-dimmed/src/index.ts‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
import { tags as t } from '@lezer/highlight';
2-
import { createTheme, CreateThemeOptions } from '@uiw/codemirror-themes';
3-
import { config } from './color';
2+
import { createTheme, type CreateThemeOptions } from '@uiw/codemirror-themes';
3+
import { config as c } from './color';
44

55
export const defaultSettingsMonokaiDimmed: CreateThemeOptions['settings'] = {
6-
background: config.background,
7-
foreground: config.foreground,
8-
caret: config.cursor,
9-
selection: config.selection,
10-
selectionMatch: config.selection,
11-
gutterBackground: config.background,
12-
gutterForeground: config.foreground,
13-
lineHighlight: config.activeLine,
6+
background: c.background,
7+
foreground: c.foreground,
8+
caret: c.cursor,
9+
selection: c.selection,
10+
selectionMatch: c.selection,
11+
gutterBackground: c.background,
12+
gutterForeground: c.foreground,
13+
lineHighlight: c.activeLine,
1414
};
1515

1616
export const monokaiDimmedInit = (options?: Partial<CreateThemeOptions>) => {
@@ -22,26 +22,26 @@ export const monokaiDimmedInit = (options?: Partial<CreateThemeOptions>) => {
2222
...settings,
2323
},
2424
styles: [
25-
{ tag: t.keyword, color: config.keyword },
26-
{ tag: [t.name, t.deleted, t.character, t.macroName], color: config.variable },
27-
{ tag: [t.propertyName], color: config.function },
28-
{ tag: [t.processingInstruction, t.string, t.inserted, t.special(t.string)], color: config.string },
29-
{ tag: [t.function(t.variableName), t.labelName], color: config.function },
30-
{ tag: [t.color, t.constant(t.name), t.standard(t.name)], color: config.constant },
31-
{ tag: [t.definition(t.name), t.separator], color: config.variable },
32-
{ tag: [t.className], color: config.class },
33-
{ tag: [t.number, t.changed, t.annotation, t.modifier, t.self, t.namespace], color: config.number },
34-
{ tag: [t.typeName], color: config.type, fontStyle: config.type },
35-
{ tag: [t.operator, t.operatorKeyword], color: config.keyword },
36-
{ tag: [t.url, t.escape, t.regexp, t.link], color: config.regexp },
37-
{ tag: [t.meta, t.comment], color: config.comment },
38-
{ tag: t.tagName, color: config.tag },
25+
{ tag: t.keyword, color: c.keyword },
26+
{ tag: [t.name, t.deleted, t.character, t.macroName], color: c.variable },
27+
{ tag: [t.propertyName], color: c.function },
28+
{ tag: [t.processingInstruction, t.string, t.inserted, t.special(t.string)], color: c.string },
29+
{ tag: [t.function(t.variableName), t.labelName], color: c.function },
30+
{ tag: [t.color, t.constant(t.name), t.standard(t.name)], color: c.constant },
31+
{ tag: [t.definition(t.name), t.separator], color: c.variable },
32+
{ tag: [t.className], color: c.class },
33+
{ tag: [t.number, t.changed, t.annotation, t.modifier, t.self, t.namespace], color: c.number },
34+
{ tag: [t.typeName], color: c.type, fontStyle: c.type },
35+
{ tag: [t.operator, t.operatorKeyword], color: c.keyword },
36+
{ tag: [t.url, t.escape, t.regexp, t.link], color: c.regexp },
37+
{ tag: [t.meta, t.comment], color: c.comment },
38+
{ tag: t.tagName, color: c.tag },
3939
{ tag: t.strong, fontWeight: 'bold' },
4040
{ tag: t.emphasis, fontStyle: 'italic' },
4141
{ tag: t.link, textDecoration: 'underline' },
42-
{ tag: t.heading, fontWeight: 'bold', color: config.heading },
43-
{ tag: [t.atom, t.bool, t.special(t.variableName)], color: config.variable },
44-
{ tag: t.invalid, color: config.invalid },
42+
{ tag: t.heading, fontWeight: 'bold', color: c.heading },
43+
{ tag: [t.atom, t.bool, t.special(t.variableName)], color: c.variable },
44+
{ tag: t.invalid, color: c.invalid },
4545
{ tag: t.strikethrough, textDecoration: 'line-through' },
4646
...styles,
4747
],

‎themes/monokai/src/index.ts‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
import { tags as t } from '@lezer/highlight';
2-
import { createTheme, CreateThemeOptions } from '@uiw/codemirror-themes';
3-
import { config } from './color';
2+
import { createTheme, type CreateThemeOptions } from '@uiw/codemirror-themes';
3+
import { config as c } from './color';
44

55
export const defaultSettingsMonokai: CreateThemeOptions['settings'] = {
6-
background: config.background,
7-
foreground: config.foreground,
8-
caret: config.cursor,
9-
selection: config.selection,
10-
selectionMatch: config.selection,
11-
gutterBackground: config.background,
12-
gutterForeground: config.foreground,
13-
lineHighlight: config.activeLine,
6+
background: c.background,
7+
foreground: c.foreground,
8+
caret: c.cursor,
9+
selection: c.selection,
10+
selectionMatch: c.selection,
11+
gutterBackground: c.background,
12+
gutterForeground: c.foreground,
13+
lineHighlight: c.activeLine,
1414
};
1515

1616
export const monokaiInit = (options?: Partial<CreateThemeOptions>) => {
@@ -22,26 +22,26 @@ export const monokaiInit = (options?: Partial<CreateThemeOptions>) => {
2222
...settings,
2323
},
2424
styles: [
25-
{ tag: t.keyword, color: config.keyword },
26-
{ tag: [t.name, t.deleted, t.character, t.macroName], color: config.variable },
27-
{ tag: [t.propertyName], color: config.function },
28-
{ tag: [t.processingInstruction, t.string, t.inserted, t.special(t.string)], color: config.string },
29-
{ tag: [t.function(t.variableName), t.labelName], color: config.function },
30-
{ tag: [t.color, t.constant(t.name), t.standard(t.name)], color: config.constant },
31-
{ tag: [t.definition(t.name), t.separator], color: config.variable },
32-
{ tag: [t.className], color: config.class },
33-
{ tag: [t.number, t.changed, t.annotation, t.modifier, t.self, t.namespace], color: config.number },
34-
{ tag: [t.typeName], color: config.type, fontStyle: config.type },
35-
{ tag: [t.operator, t.operatorKeyword], color: config.keyword },
36-
{ tag: [t.url, t.escape, t.regexp, t.link], color: config.regexp },
37-
{ tag: [t.meta, t.comment], color: config.comment },
38-
{ tag: t.tagName, color: config.tag },
25+
{ tag: t.keyword, color: c.keyword },
26+
{ tag: [t.name, t.deleted, t.character, t.macroName], color: c.variable },
27+
{ tag: [t.propertyName], color: c.function },
28+
{ tag: [t.processingInstruction, t.string, t.inserted, t.special(t.string)], color: c.string },
29+
{ tag: [t.function(t.variableName), t.labelName], color: c.function },
30+
{ tag: [t.color, t.constant(t.name), t.standard(t.name)], color: c.constant },
31+
{ tag: [t.definition(t.name), t.separator], color: c.variable },
32+
{ tag: [t.className], color: c.class },
33+
{ tag: [t.number, t.changed, t.annotation, t.modifier, t.self, t.namespace], color: c.number },
34+
{ tag: [t.typeName], color: c.type, fontStyle: c.type },
35+
{ tag: [t.operator, t.operatorKeyword], color: c.keyword },
36+
{ tag: [t.url, t.escape, t.regexp, t.link], color: c.regexp },
37+
{ tag: [t.meta, t.comment], color: c.comment },
38+
{ tag: t.tagName, color: c.tag },
3939
{ tag: t.strong, fontWeight: 'bold' },
4040
{ tag: t.emphasis, fontStyle: 'italic' },
4141
{ tag: t.link, textDecoration: 'underline' },
42-
{ tag: t.heading, fontWeight: 'bold', color: config.heading },
43-
{ tag: [t.atom, t.bool, t.special(t.variableName)], color: config.variable },
44-
{ tag: t.invalid, color: config.invalid },
42+
{ tag: t.heading, fontWeight: 'bold', color: c.heading },
43+
{ tag: [t.atom, t.bool, t.special(t.variableName)], color: c.variable },
44+
{ tag: t.invalid, color: c.invalid },
4545
{ tag: t.strikethrough, textDecoration: 'line-through' },
4646
...styles,
4747
],

‎themes/quietlight/src/index.ts‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
import { tags as t } from '@lezer/highlight';
2-
import { createTheme, CreateThemeOptions } from '@uiw/codemirror-themes';
3-
import { config } from './color';
2+
import { createTheme, type CreateThemeOptions } from '@uiw/codemirror-themes';
3+
import { config as c } from './color';
44

55
export const defaultSettingsQuietlight: CreateThemeOptions['settings'] = {
6-
background: config.background,
7-
foreground: config.foreground,
8-
caret: config.cursor,
9-
selection: config.selection,
10-
selectionMatch: config.selection,
11-
gutterBackground: config.background,
12-
gutterForeground: config.foreground,
6+
background: c.background,
7+
foreground: c.foreground,
8+
caret: c.cursor,
9+
selection: c.selection,
10+
selectionMatch: c.selection,
11+
gutterBackground: c.background,
12+
gutterForeground: c.foreground,
1313
gutterBorder: 'transparent',
14-
lineHighlight: config.activeLine,
14+
lineHighlight: c.activeLine,
1515
};
1616

1717
export const quietlightInit = (options?: Partial<CreateThemeOptions>) => {
@@ -23,26 +23,26 @@ export const quietlightInit = (options?: Partial<CreateThemeOptions>) => {
2323
...settings,
2424
},
2525
styles: [
26-
{ tag: t.keyword, color: config.keyword },
27-
{ tag: [t.name, t.deleted, t.character, t.macroName], color: config.variable },
28-
{ tag: [t.propertyName], color: config.function },
29-
{ tag: [t.processingInstruction, t.string, t.inserted, t.special(t.string)], color: config.string },
30-
{ tag: [t.function(t.variableName), t.labelName], color: config.function },
31-
{ tag: [t.color, t.constant(t.name), t.standard(t.name)], color: config.constant },
32-
{ tag: [t.definition(t.name), t.separator], color: config.variable },
33-
{ tag: [t.className], color: config.class },
34-
{ tag: [t.number, t.changed, t.annotation, t.modifier, t.self, t.namespace], color: config.number },
35-
{ tag: [t.typeName], color: config.type, fontStyle: config.type },
36-
{ tag: [t.operator, t.operatorKeyword], color: config.keyword },
37-
{ tag: [t.url, t.escape, t.regexp, t.link], color: config.regexp },
38-
{ tag: [t.meta, t.comment], color: config.comment },
39-
{ tag: t.tagName, color: config.tag },
26+
{ tag: t.keyword, color: c.keyword },
27+
{ tag: [t.name, t.deleted, t.character, t.macroName], color: c.variable },
28+
{ tag: [t.propertyName], color: c.function },
29+
{ tag: [t.processingInstruction, t.string, t.inserted, t.special(t.string)], color: c.string },
30+
{ tag: [t.function(t.variableName), t.labelName], color: c.function },
31+
{ tag: [t.color, t.constant(t.name), t.standard(t.name)], color: c.constant },
32+
{ tag: [t.definition(t.name), t.separator], color: c.variable },
33+
{ tag: [t.className], color: c.class },
34+
{ tag: [t.number, t.changed, t.annotation, t.modifier, t.self, t.namespace], color: c.number },
35+
{ tag: [t.typeName], color: c.type, fontStyle: c.type },
36+
{ tag: [t.operator, t.operatorKeyword], color: c.keyword },
37+
{ tag: [t.url, t.escape, t.regexp, t.link], color: c.regexp },
38+
{ tag: [t.meta, t.comment], color: c.comment },
39+
{ tag: t.tagName, color: c.tag },
4040
{ tag: t.strong, fontWeight: 'bold' },
4141
{ tag: t.emphasis, fontStyle: 'italic' },
4242
{ tag: t.link, textDecoration: 'underline' },
43-
{ tag: t.heading, fontWeight: 'bold', color: config.heading },
44-
{ tag: [t.atom, t.bool, t.special(t.variableName)], color: config.variable },
45-
{ tag: t.invalid, color: config.invalid },
43+
{ tag: t.heading, fontWeight: 'bold', color: c.heading },
44+
{ tag: [t.atom, t.bool, t.special(t.variableName)], color: c.variable },
45+
{ tag: t.invalid, color: c.invalid },
4646
{ tag: t.strikethrough, textDecoration: 'line-through' },
4747
...styles,
4848
],

0 commit comments

Comments
 (0)