Skip to content

Commit cb8aa8e

Browse files
committedApr 16, 2020
*highlight,plugin.zsh,other: Default theme to have a secondary
1 parent f1e9456 commit cb8aa8e

File tree

4 files changed

+75
-2
lines changed

4 files changed

+75
-2
lines changed
 

‎fast-highlight

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ zstyle :plugin:fast-syntax-highlighting theme default
107107
: ${FAST_HIGHLIGHT_STYLES[incorrect-subtle]:=fg=red}
108108
: ${FAST_HIGHLIGHT_STYLES[subtle-separator]:=fg=green}
109109
: ${FAST_HIGHLIGHT_STYLES[subtle-bg]:=bg=18}
110-
: ${FAST_HIGHLIGHT_STYLES[secondary]:=}
110+
: ${FAST_HIGHLIGHT_STYLES[secondary]:=free}
111111
fi
112112

113113
# This can overwrite some of *_STYLES fields

‎fast-syntax-highlighting.plugin.zsh

+12
Original file line numberDiff line numberDiff line change
@@ -359,3 +359,15 @@ unset __fsyh_theme
359359
alias fsh-alias=fast-theme
360360

361361
-fast-highlight-fill-option-variables
362+
363+
if [[ ! -e $FAST_BASE_DIR/secondary_theme.zsh ]] {
364+
if { type curl &>/dev/null } {
365+
curl -fsSL -o "$FAST_BASE_DIR/secondary_theme" \
366+
https://raw.githubusercontent.com/zdharma/fast-syntax-highlighting/master/share/fast_theme.zsh \
367+
&>/dev/null
368+
} elif { type wget &>/dev/null } {
369+
wget -O "$FAST_BASE_DIR/secondary_theme" \
370+
https://raw.githubusercontent.com/zdharma/fast-syntax-highlighting/master/share/fast_theme.zsh \
371+
&>/dev/null
372+
}
373+
}

‎share/free_theme.zsh

+61
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
: ${FAST_HIGHLIGHT_STYLES[freedefault]:=none}
2+
: ${FAST_HIGHLIGHT_STYLES[freeunknown-token]:=fg=red,bold}
3+
: ${FAST_HIGHLIGHT_STYLES[freereserved-word]:=fg=150}
4+
: ${FAST_HIGHLIGHT_STYLES[freealias]:=fg=180}
5+
: ${FAST_HIGHLIGHT_STYLES[freesuffix-alias]:=fg=180}
6+
: ${FAST_HIGHLIGHT_STYLES[freebuiltin]:=fg=180}
7+
: ${FAST_HIGHLIGHT_STYLES[freefunction]:=fg=180}
8+
: ${FAST_HIGHLIGHT_STYLES[freecommand]:=fg=180}
9+
: ${FAST_HIGHLIGHT_STYLES[freeprecommand]:=fg=180}
10+
: ${FAST_HIGHLIGHT_STYLES[freecommandseparator]:=none}
11+
: ${FAST_HIGHLIGHT_STYLES[freehashed-command]:=fg=180}
12+
: ${FAST_HIGHLIGHT_STYLES[freepath]:=fg=166}
13+
: ${FAST_HIGHLIGHT_STYLES[freepath_pathseparator]:=}
14+
: ${FAST_HIGHLIGHT_STYLES[freeglobbing]:=fg=112}
15+
: ${FAST_HIGHLIGHT_STYLES[freeglobbing-ext]:=fg=118}
16+
: ${FAST_HIGHLIGHT_STYLES[freehistory-expansion]:=fg=blue,bold}
17+
: ${FAST_HIGHLIGHT_STYLES[freesingle-hyphen-option]:=fg=110}
18+
: ${FAST_HIGHLIGHT_STYLES[freedouble-hyphen-option]:=fg=110}
19+
: ${FAST_HIGHLIGHT_STYLES[freeback-quoted-argument]:=none}
20+
: ${FAST_HIGHLIGHT_STYLES[freesingle-quoted-argument]:=fg=150}
21+
: ${FAST_HIGHLIGHT_STYLES[freedouble-quoted-argument]:=fg=150}
22+
: ${FAST_HIGHLIGHT_STYLES[freedollar-quoted-argument]:=fg=150}
23+
: ${FAST_HIGHLIGHT_STYLES[freeback-or-dollar-double-quoted-argument]:=fg=110}
24+
: ${FAST_HIGHLIGHT_STYLES[freeback-dollar-quoted-argument]:=fg=110}
25+
: ${FAST_HIGHLIGHT_STYLES[freeassign]:=none}
26+
: ${FAST_HIGHLIGHT_STYLES[freeredirection]:=none}
27+
: ${FAST_HIGHLIGHT_STYLES[freecomment]:=fg=black,bold}
28+
: ${FAST_HIGHLIGHT_STYLES[freevariable]:=none}
29+
: ${FAST_HIGHLIGHT_STYLES[freemathvar]:=fg=blue,bold}
30+
: ${FAST_HIGHLIGHT_STYLES[freemathnum]:=fg=166}
31+
: ${FAST_HIGHLIGHT_STYLES[freematherr]:=fg=red}
32+
: ${FAST_HIGHLIGHT_STYLES[freeassign-array-bracket]:=fg=180}
33+
: ${FAST_HIGHLIGHT_STYLES[freefor-loop-variable]:=none}
34+
: ${FAST_HIGHLIGHT_STYLES[freefor-loop-number]:=fg=150}
35+
: ${FAST_HIGHLIGHT_STYLES[freefor-loop-operator]:=fg=150}
36+
: ${FAST_HIGHLIGHT_STYLES[freefor-loop-separator]:=fg=109}
37+
: ${FAST_HIGHLIGHT_STYLES[freeexec-descriptor]:=fg=yellow,bold}
38+
: ${FAST_HIGHLIGHT_STYLES[freehere-string-tri]:=fg=yellow}
39+
: ${FAST_HIGHLIGHT_STYLES[freehere-string-text]:=bg=19}
40+
: ${FAST_HIGHLIGHT_STYLES[freehere-string-var]:=fg=110,bg=19}
41+
: ${FAST_HIGHLIGHT_STYLES[freesecondary]:=zdharma}
42+
: ${FAST_HIGHLIGHT_STYLES[freecase-input]:=fg=180}
43+
: ${FAST_HIGHLIGHT_STYLES[freecase-parentheses]:=fg=116}
44+
: ${FAST_HIGHLIGHT_STYLES[freecase-condition]:=bg=19}
45+
: ${FAST_HIGHLIGHT_STYLES[freecorrect-subtle]:=bg=55}
46+
: ${FAST_HIGHLIGHT_STYLES[freeincorrect-subtle]:=bg=52}
47+
: ${FAST_HIGHLIGHT_STYLES[freesubtle-separator]:=none}
48+
: ${FAST_HIGHLIGHT_STYLES[freesubtle-bg]:=bg=18}
49+
: ${FAST_HIGHLIGHT_STYLES[freepath-to-dir]:=fg=166,underline}
50+
: ${FAST_HIGHLIGHT_STYLES[freepaired-bracket]:=bg=blue}
51+
: ${FAST_HIGHLIGHT_STYLES[freebracket-level-1]:=fg=130}
52+
: ${FAST_HIGHLIGHT_STYLES[freebracket-level-2]:=fg=70}
53+
: ${FAST_HIGHLIGHT_STYLES[freebracket-level-3]:=fg=69}
54+
: ${FAST_HIGHLIGHT_STYLES[freeglobal-alias]:=bg=19}
55+
: ${FAST_HIGHLIGHT_STYLES[freesubcommand]:=fg=150}
56+
: ${FAST_HIGHLIGHT_STYLES[freesingle-sq-bracket]:=fg=180}
57+
: ${FAST_HIGHLIGHT_STYLES[freedouble-sq-bracket]:=fg=180}
58+
: ${FAST_HIGHLIGHT_STYLES[freedouble-paren]:=fg=150}
59+
: ${FAST_HIGHLIGHT_STYLES[freeoptarg-string]:=fg=150}
60+
: ${FAST_HIGHLIGHT_STYLES[freeoptarg-number]:=fg=166}
61+
: ${FAST_HIGHLIGHT_STYLES[freerecursive-base]:=fg=183}

‎themes/default.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ correct-subtle = 12
1414
incorrect-subtle = red
1515
subtle-separator = green
1616
subtle-bg = bg:18
17-
secondary =
17+
secondary = free
1818
; recursive-base =
1919

2020
[command-point]

0 commit comments

Comments
 (0)
Please sign in to comment.