Skip to content

Commit a10caab

Browse files
tobil4sktobil4sk
authored
Fix highlighting for certain keywords (#284)
* Fix highlighting for exception keywords According to vim docs: `Exception try, catch, throw` * Fix highlighting of let and var keywords According to vim docs: `Identifier any variable name` let/var are not variable names, they are keywords * Fix highlighting of operator keywords According to vim docs: `Operator "sizeof", "+", "*", etc.` * Fix highlighting of import statements * Update merged files * Mark more modifiers as StorageClass According to vim docs: StorageClass static, register, volatile, etc. * Fix highlighting of export keyword * Update merged files
1 parent 9b16b86 commit a10caab

File tree

3 files changed

+24
-24
lines changed

3 files changed

+24
-24
lines changed

‎merged/typescript.vim

+8-8
Original file line numberDiff line numberDiff line change
@@ -2048,16 +2048,16 @@ hi def link typescriptCase Conditional
20482048
hi def link typescriptDefault typescriptCase
20492049
hi def link typescriptBranch Conditional
20502050
hi def link typescriptIdentifier Structure
2051-
hi def link typescriptVariable Identifier
2051+
hi def link typescriptVariable Keyword
20522052
hi def link typescriptUsing Identifier
20532053
hi def link typescriptDestructureVariable PreProc
20542054
hi def link typescriptEnumKeyword Identifier
20552055
hi def link typescriptRepeat Repeat
20562056
hi def link typescriptForOperator Repeat
20572057
hi def link typescriptStatementKeyword Statement
20582058
hi def link typescriptMessage Keyword
2059-
hi def link typescriptOperator Identifier
2060-
hi def link typescriptKeywordOp Identifier
2059+
hi def link typescriptOperator Operator
2060+
hi def link typescriptKeywordOp Operator
20612061
hi def link typescriptCastKeyword Special
20622062
hi def link typescriptType Type
20632063
hi def link typescriptNull Boolean
@@ -2068,14 +2068,14 @@ hi def link typescriptDestructureLabel Function
20682068
hi def link typescriptLabel Label
20692069
hi def link typescriptTupleLable Label
20702070
hi def link typescriptStringProperty String
2071-
hi def link typescriptImport Special
2071+
hi def link typescriptImport Keyword
20722072
hi def link typescriptImportType Special
20732073
hi def link typescriptAmbientDeclaration Special
2074-
hi def link typescriptExport Special
2074+
hi def link typescriptExport Keyword
20752075
hi def link typescriptExportType Special
20762076
hi def link typescriptModule Special
2077-
hi def link typescriptTry Special
2078-
hi def link typescriptExceptions Special
2077+
hi def link typescriptTry Exception
2078+
hi def link typescriptExceptions Exception
20792079

20802080
hi def link typescriptMember Function
20812081
hi def link typescriptMethodAccessor Operator
@@ -2098,7 +2098,7 @@ hi def link typescriptAbstract Special
20982098
" hi def link typescriptClassHeritage Function
20992099
" hi def link typescriptInterfaceHeritage Function
21002100
hi def link typescriptClassStatic StorageClass
2101-
hi def link typescriptReadonlyModifier Keyword
2101+
hi def link typescriptReadonlyModifier StorageClass
21022102
hi def link typescriptInterfaceKeyword Keyword
21032103
hi def link typescriptInterfaceExtends Keyword
21042104
hi def link typescriptInterfaceName Function

‎merged/typescriptreact.vim

+8-8
Original file line numberDiff line numberDiff line change
@@ -2144,16 +2144,16 @@ hi def link typescriptCase Conditional
21442144
hi def link typescriptDefault typescriptCase
21452145
hi def link typescriptBranch Conditional
21462146
hi def link typescriptIdentifier Structure
2147-
hi def link typescriptVariable Identifier
2147+
hi def link typescriptVariable Keyword
21482148
hi def link typescriptUsing Identifier
21492149
hi def link typescriptDestructureVariable PreProc
21502150
hi def link typescriptEnumKeyword Identifier
21512151
hi def link typescriptRepeat Repeat
21522152
hi def link typescriptForOperator Repeat
21532153
hi def link typescriptStatementKeyword Statement
21542154
hi def link typescriptMessage Keyword
2155-
hi def link typescriptOperator Identifier
2156-
hi def link typescriptKeywordOp Identifier
2155+
hi def link typescriptOperator Operator
2156+
hi def link typescriptKeywordOp Operator
21572157
hi def link typescriptCastKeyword Special
21582158
hi def link typescriptType Type
21592159
hi def link typescriptNull Boolean
@@ -2164,14 +2164,14 @@ hi def link typescriptDestructureLabel Function
21642164
hi def link typescriptLabel Label
21652165
hi def link typescriptTupleLable Label
21662166
hi def link typescriptStringProperty String
2167-
hi def link typescriptImport Special
2167+
hi def link typescriptImport Keyword
21682168
hi def link typescriptImportType Special
21692169
hi def link typescriptAmbientDeclaration Special
2170-
hi def link typescriptExport Special
2170+
hi def link typescriptExport Keyword
21712171
hi def link typescriptExportType Special
21722172
hi def link typescriptModule Special
2173-
hi def link typescriptTry Special
2174-
hi def link typescriptExceptions Special
2173+
hi def link typescriptTry Exception
2174+
hi def link typescriptExceptions Exception
21752175

21762176
hi def link typescriptMember Function
21772177
hi def link typescriptMethodAccessor Operator
@@ -2194,7 +2194,7 @@ hi def link typescriptAbstract Special
21942194
" hi def link typescriptClassHeritage Function
21952195
" hi def link typescriptInterfaceHeritage Function
21962196
hi def link typescriptClassStatic StorageClass
2197-
hi def link typescriptReadonlyModifier Keyword
2197+
hi def link typescriptReadonlyModifier StorageClass
21982198
hi def link typescriptInterfaceKeyword Keyword
21992199
hi def link typescriptInterfaceExtends Keyword
22002200
hi def link typescriptInterfaceName Function

‎syntax/common.vim

+8-8
Original file line numberDiff line numberDiff line change
@@ -82,16 +82,16 @@ hi def link typescriptCase Conditional
8282
hi def link typescriptDefault typescriptCase
8383
hi def link typescriptBranch Conditional
8484
hi def link typescriptIdentifier Structure
85-
hi def link typescriptVariable Identifier
85+
hi def link typescriptVariable Keyword
8686
hi def link typescriptUsing Identifier
8787
hi def link typescriptDestructureVariable PreProc
8888
hi def link typescriptEnumKeyword Identifier
8989
hi def link typescriptRepeat Repeat
9090
hi def link typescriptForOperator Repeat
9191
hi def link typescriptStatementKeyword Statement
9292
hi def link typescriptMessage Keyword
93-
hi def link typescriptOperator Identifier
94-
hi def link typescriptKeywordOp Identifier
93+
hi def link typescriptOperator Operator
94+
hi def link typescriptKeywordOp Operator
9595
hi def link typescriptCastKeyword Special
9696
hi def link typescriptType Type
9797
hi def link typescriptNull Boolean
@@ -102,14 +102,14 @@ hi def link typescriptDestructureLabel Function
102102
hi def link typescriptLabel Label
103103
hi def link typescriptTupleLable Label
104104
hi def link typescriptStringProperty String
105-
hi def link typescriptImport Special
105+
hi def link typescriptImport Keyword
106106
hi def link typescriptImportType Special
107107
hi def link typescriptAmbientDeclaration Special
108-
hi def link typescriptExport Special
108+
hi def link typescriptExport Keyword
109109
hi def link typescriptExportType Special
110110
hi def link typescriptModule Special
111-
hi def link typescriptTry Special
112-
hi def link typescriptExceptions Special
111+
hi def link typescriptTry Exception
112+
hi def link typescriptExceptions Exception
113113

114114
hi def link typescriptMember Function
115115
hi def link typescriptMethodAccessor Operator
@@ -132,7 +132,7 @@ hi def link typescriptAbstract Special
132132
" hi def link typescriptClassHeritage Function
133133
" hi def link typescriptInterfaceHeritage Function
134134
hi def link typescriptClassStatic StorageClass
135-
hi def link typescriptReadonlyModifier Keyword
135+
hi def link typescriptReadonlyModifier StorageClass
136136
hi def link typescriptInterfaceKeyword Keyword
137137
hi def link typescriptInterfaceExtends Keyword
138138
hi def link typescriptInterfaceName Function

0 commit comments

Comments
 (0)