Improve compatibility with built in typescript syntax

estilo/palettes/shades_of_purple.yml

@@ -18,7 +18,7 @@ strings: "#A5FF90"
 stringsLite: "#d2ffc7"
 jsonString: "#92FC79"
 darkerStrings: "#73b264"
-templates: "#75e44c"
+templates: "#3AD900"
 definitions: "#FB94FF"
 invalid: "#EC3A37"
 diffAdded: "#00FF00"
@@ -31,4 +31,3 @@ currentSearch: "#ff7300"
 objectKeys: "#80FFBB"
 # This should be similar to `comment`
 selectionBackground: "#7d44b2"
-cssEntity: "#3AD900"

estilo/syntax/base.yml

@@ -52,23 +52,23 @@ Character: "" # Constant
 Boolean: "" # Constant
 Number: "" # Constant
 Float: "" # Constant
-Identifier: "keywords"
-Function: "keywords" # Identifier
-Statement: ""
-Conditional: "keywords" # Statement
+Identifier: "white"
+Function: "contrast" # Identifier
+Statement: "keywords"
+Conditional: "" # Statement
 Repeat: "" # Statement
 Label: "" # Statement
 Operator: "keywords ." # Statement
 Keyword: "" # Statement
 Exception: "" # Statement
 PreProc: ""
-Include: "" # PreProc
+Include: "keywords" # PreProc
 Define: "" # PreProc
 Macro: "" # PreProc
 PreCondit: "" # PreProc
-Type: "objectKeys ."
+Type: "contrast"
 StorageClass: "keywords ." # Type
-Structure: "contrastLite" # Type
+Structure: "keywords" # Type
 Typedef: "" # Type
 Special: "other"
 SpecialChar: "" # Special

estilo/syntax/typescript.yml

@@ -1,19 +1,42 @@
+# Typescript: amadeus/vim-typescript
 tsExportDefault: 'contrast'
 tsFuncArgs: 'other - i'
-typescriptParameters: 'other - i'
 tsThis: 'keywords - i'
+
+# leafgarland/typescript-vim
+typescriptParameters: 'other - i'
+typescriptStorageClass: 'contrast'
+
+# Builtin styles
+typescriptIdentifier: 'definitions' # Structure
+typescriptExport: 'keywords - i'
+typescriptAmbientDeclaration: 'keywords - i'
+typescriptTemplate: 'templates' # String
+typescriptPredefinedType: 'objectKeys' # Type
+typescriptPrototype: 'objectKeys' # Type
+
+typescriptVariable: '@Keyword'
+typescriptOperator: '@Keyword'
+typescriptImport: '@Keyword'
+typescriptTry: '@Exception'
+typescriptExceptions: '@Exception'
+
+typescriptImportType: '@Keyword'
+typescriptExportType: '@Keyword'
+typescriptModule: '@Keyword'
+typescriptInterfaceName: '@Type' # Function
+typescriptAliasDeclaration: '@Type' # Identifier
+typescriptTypeReference: '@Type' # Identifier
+typescriptClassName: '@Type' # Identifier
+typescriptClassHeritage: '@Type' # Identifier
+typescriptCall: 'other' # PreProc
+typescriptArrowFuncArg: 'other' # PreProc
+typescriptObjectLabel: 'contrastLite' # Label
+typescriptTupleLable: 'contrastLite' # Label
+
+# tsx
 tsxAttrib: 'contrast - i'
-tsxComment: 'comment - i'
-typescriptLineComment: 'comment - i'
 tsxTagName: 'other'
 tsxTag: 'white'
 tsxCloseTag: 'white'
 tsxCloseString: 'other'
-typescriptReserved: ''
-typescriptStorageClass: 'contrast'
-typescriptIdentifier: 'other'
-typescriptInterfaceName: 'contrast'
-typescriptAliasDeclaration: 'contrast'
-typescriptInterfaceKeyword: 'contrastLiteII - i'
-typescriptAliasKeyword: 'contrastLiteII - i'
-typescriptExport: 'keywords - i'