From 2d4c710b6a75d02e9ab7b281352405751a580448 Mon Sep 17 00:00:00 2001
From: jbicker <jan.bicker@typefox.io>
Date: Wed, 17 Jul 2019 18:40:48 +0200
Subject: [PATCH] Syntax coloring

Signed-off-by: jbicker <jan.bicker@typefox.io>
---
 .../data/ino.tmLanguage.json                  | 413 +++++++++++++++
 .../src/browser/data/arduino.color-theme.json | 474 ++----------------
 yarn.lock                                     | 244 +++++----
 3 files changed, 567 insertions(+), 564 deletions(-)

diff --git a/arduino-ide-extension/data/ino.tmLanguage.json b/arduino-ide-extension/data/ino.tmLanguage.json
index fee483b0..a4747490 100644
--- a/arduino-ide-extension/data/ino.tmLanguage.json
+++ b/arduino-ide-extension/data/ino.tmLanguage.json
@@ -8,6 +8,113 @@
 	"name": "Ino",
 	"scopeName": "source.ino",
 	"patterns": [
+		{
+			"include": "#special_block"
+		},
+		{
+			"include": "#strings"
+		},
+		{
+			"match": "\\b(friend|explicit|virtual|override|final|noexcept)\\b",
+			"name": "storage.modifier.cpp"
+		},
+		{
+			"match": "\\b(private:|protected:|public:)",
+			"name": "storage.modifier.cpp"
+		},
+		{
+			"match": "\\b(catch|operator|try|throw|using)\\b",
+			"name": "keyword.control.cpp"
+		},
+		{
+			"match": "\\bdelete\\b(\\s*\\[\\])?|\\bnew\\b(?!])",
+			"name": "keyword.control.cpp"
+		},
+		{
+			"match": "\\b(f|m)[A-Z]\\w*\\b",
+			"name": "variable.other.readwrite.member.cpp"
+		},
+		{
+			"match": "\\bthis\\b",
+			"name": "variable.language.this.cpp"
+		},
+		{
+			"match": "\\bnullptr\\b",
+			"name": "constant.language.cpp"
+		},
+		{
+			"match": "\\btemplate\\b\\s*",
+			"name": "storage.type.template.cpp"
+		},
+		{
+			"match": "\\b(const_cast|dynamic_cast|reinterpret_cast|static_cast)\\b\\s*",
+			"name": "keyword.operator.cast.cpp"
+		},
+		{
+			"match": "::",
+			"name": "punctuation.separator.namespace.access.cpp"
+		},
+		{
+			"match": "\\b(and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\b",
+			"name": "keyword.operator.cpp"
+		},
+		{
+			"match": "\\b(class|decltype|wchar_t|char16_t|char32_t)\\b",
+			"name": "storage.type.cpp"
+		},
+		{
+			"match": "\\b(constexpr|export|mutable|typename|thread_local)\\b",
+			"name": "storage.modifier.cpp"
+		},
+		{
+			"begin": "(?x)\n(?:\n  ^ |                  # beginning of line\n  (?:(?<!else|new|=))  # or word + space before name\n)\n((?:[A-Za-z_][A-Za-z0-9_]*::)*+~[A-Za-z_][A-Za-z0-9_]*) # actual name\n\\s*(\\()              # opening bracket",
+			"beginCaptures": {
+				"1": {
+					"name": "entity.name.function.cpp"
+				},
+				"2": {
+					"name": "punctuation.definition.parameters.begin.c"
+				}
+			},
+			"end": "\\)",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.parameters.end.c"
+				}
+			},
+			"name": "meta.function.destructor.cpp",
+			"patterns": [
+				{
+					"include": "$base"
+				}
+			]
+		},
+		{
+			"begin": "(?x)\n(?:\n  ^ |                  # beginning of line\n  (?:(?<!else|new|=))  # or word + space before name\n)\n((?:[A-Za-z_][A-Za-z0-9_]*::)*+~[A-Za-z_][A-Za-z0-9_]*) # actual name\n\\s*(\\()              # opening bracket",
+			"beginCaptures": {
+				"1": {
+					"name": "entity.name.function.cpp"
+				},
+				"2": {
+					"name": "punctuation.definition.parameters.begin.c"
+				}
+			},
+			"end": "\\)",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.parameters.end.c"
+				}
+			},
+			"name": "meta.function.destructor.prototype.cpp",
+			"patterns": [
+				{
+					"include": "$base"
+				}
+			]
+		},
+		{
+			"include": "source.c"
+		},
 		{
 			"include": "#preprocessor-rule-enabled"
 		},
@@ -321,6 +428,19 @@
 			"match": "((\\.)|(->))\\s*(([a-zA-Z_][a-zA-Z_0-9]*)\\b(?!\\s*\\())?"
 		},
 		"block": {
+			"begin": "\\{",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.section.block.begin.bracket.curly.c"
+				}
+			},
+			"end": "\\}",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.section.block.end.bracket.curly.c"
+				}
+			},
+			"name": "meta.block.cpp",
 			"patterns": [
 				{
 					"begin": "{",
@@ -341,6 +461,9 @@
 							"include": "#block_innards"
 						}
 					]
+				},
+				{
+					"include": "$base"
 				}
 			]
 		},
@@ -706,6 +829,69 @@
 							"include": "#line_continuation_character"
 						}
 					]
+				},
+				{
+					"begin": "(u|u8|U|L)?\"",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.begin.cpp"
+						},
+						"1": {
+							"name": "meta.encoding.cpp"
+						}
+					},
+					"end": "\"",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.end.cpp"
+						}
+					},
+					"name": "string.quoted.double.cpp",
+					"patterns": [
+						{
+							"match": "\\\\u\\h{4}|\\\\U\\h{8}",
+							"name": "constant.character.escape.cpp"
+						},
+						{
+							"match": "\\\\['\"?\\\\abfnrtv]",
+							"name": "constant.character.escape.cpp"
+						},
+						{
+							"match": "\\\\[0-7]{1,3}",
+							"name": "constant.character.escape.cpp"
+						},
+						{
+							"match": "\\\\x\\h+",
+							"name": "constant.character.escape.cpp"
+						},
+						{
+							"include": "source.c#string_placeholder"
+						}
+					]
+				},
+				{
+					"begin": "(u|u8|U|L)?R\"(?:([^ ()\\\\\\t]{0,16})|([^ ()\\\\\\t]*))\\(",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.begin.cpp"
+						},
+						"1": {
+							"name": "meta.encoding.cpp"
+						},
+						"3": {
+							"name": "invalid.illegal.delimiter-too-long.cpp"
+						}
+					},
+					"end": "\\)\\2(\\3)\"",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.end.cpp"
+						},
+						"1": {
+							"name": "invalid.illegal.delimiter-too-long.cpp"
+						}
+					},
+					"name": "string.quoted.double.raw.cpp"
 				}
 			]
 		},
@@ -1954,6 +2140,233 @@
 					"include": "#block_innards"
 				}
 			]
+		},
+		"angle_brackets": {
+			"begin": "<",
+			"end": ">",
+			"name": "meta.angle-brackets.cpp",
+			"patterns": [
+				{
+					"include": "#angle_brackets"
+				},
+				{
+					"include": "$base"
+				}
+			]
+		},
+		"constructor": {
+			"patterns": [
+				{
+					"begin": "(?x)\n(?:^\\s*)  # beginning of line\n((?!while|for|do|if|else|switch|catch|enumerate|r?iterate)[A-Za-z_][A-Za-z0-9_:]*) # actual name\n\\s*(\\()  # opening bracket",
+					"beginCaptures": {
+						"1": {
+							"name": "entity.name.function.cpp"
+						},
+						"2": {
+							"name": "punctuation.definition.parameters.begin.c"
+						}
+					},
+					"end": "\\)",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.parameters.end.c"
+						}
+					},
+					"name": "meta.function.constructor.cpp",
+					"patterns": [
+						{
+							"include": "$base"
+						}
+					]
+				},
+				{
+					"begin": "(?x)\n(:)\n(\n  (?=\n    \\s*[A-Za-z_][A-Za-z0-9_:]* # actual name\n    \\s* (\\() # opening bracket\n  )\n)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.parameters.c"
+						}
+					},
+					"end": "(?=\\{)",
+					"name": "meta.function.constructor.initializer-list.cpp",
+					"patterns": [
+						{
+							"include": "$base"
+						}
+					]
+				}
+			]
+		},
+		"special_block": {
+			"patterns": [
+				{
+					"begin": "\\b(using)\\b\\s*(namespace)\\b\\s*((?:[_A-Za-z][_A-Za-z0-9]*\\b(::)?)*)",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.control.cpp"
+						},
+						"2": {
+							"name": "storage.type.cpp"
+						},
+						"3": {
+							"name": "entity.name.type.cpp"
+						}
+					},
+					"end": "(;)",
+					"name": "meta.using-namespace-declaration.cpp"
+				},
+				{
+					"begin": "\\b(namespace)\\b\\s*([_A-Za-z][_A-Za-z0-9]*\\b)?+",
+					"beginCaptures": {
+						"1": {
+							"name": "storage.type.cpp"
+						},
+						"2": {
+							"name": "entity.name.type.cpp"
+						}
+					},
+					"captures": {
+						"1": {
+							"name": "keyword.control.namespace.$2"
+						}
+					},
+					"end": "(?<=\\})|(?=(;|,|\\(|\\)|>|\\[|\\]|=))",
+					"name": "meta.namespace-block.cpp",
+					"patterns": [
+						{
+							"begin": "\\{",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.definition.scope.cpp"
+								}
+							},
+							"end": "\\}",
+							"endCaptures": {
+								"0": {
+									"name": "punctuation.definition.scope.cpp"
+								}
+							},
+							"patterns": [
+								{
+									"include": "#special_block"
+								},
+								{
+									"include": "#constructor"
+								},
+								{
+									"include": "$base"
+								}
+							]
+						},
+						{
+							"include": "$base"
+						}
+					]
+				},
+				{
+					"begin": "\\b(class|struct)\\b\\s*([_A-Za-z][_A-Za-z0-9]*\\b)?+(\\s*:\\s*(public|protected|private)\\s*([_A-Za-z][_A-Za-z0-9]*\\b)((\\s*,\\s*(public|protected|private)\\s*[_A-Za-z][_A-Za-z0-9]*\\b)*))?",
+					"beginCaptures": {
+						"1": {
+							"name": "storage.type.cpp"
+						},
+						"2": {
+							"name": "entity.name.type.cpp"
+						},
+						"4": {
+							"name": "storage.type.modifier.cpp"
+						},
+						"5": {
+							"name": "entity.name.type.inherited.cpp"
+						},
+						"6": {
+							"patterns": [
+								{
+									"match": "(public|protected|private)",
+									"name": "storage.type.modifier.cpp"
+								},
+								{
+									"match": "[_A-Za-z][_A-Za-z0-9]*",
+									"name": "entity.name.type.inherited.cpp"
+								}
+							]
+						}
+					},
+					"end": "(?<=\\})|(?=(;|\\(|\\)|>|\\[|\\]|=))",
+					"name": "meta.class-struct-block.cpp",
+					"patterns": [
+						{
+							"include": "#angle_brackets"
+						},
+						{
+							"begin": "\\{",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.section.block.begin.bracket.curly.cpp"
+								}
+							},
+							"end": "(\\})(\\s*\\n)?",
+							"endCaptures": {
+								"1": {
+									"name": "punctuation.section.block.end.bracket.curly.cpp"
+								},
+								"2": {
+									"name": "invalid.illegal.you-forgot-semicolon.cpp"
+								}
+							},
+							"patterns": [
+								{
+									"include": "#special_block"
+								},
+								{
+									"include": "#constructor"
+								},
+								{
+									"include": "$base"
+								}
+							]
+						},
+						{
+							"include": "$base"
+						}
+					]
+				},
+				{
+					"begin": "\\b(extern)(?=\\s*\")",
+					"beginCaptures": {
+						"1": {
+							"name": "storage.modifier.cpp"
+						}
+					},
+					"end": "(?<=\\})|(?=\\w)|(?=\\s*#\\s*endif\\b)",
+					"name": "meta.extern-block.cpp",
+					"patterns": [
+						{
+							"begin": "\\{",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.section.block.begin.bracket.curly.c"
+								}
+							},
+							"end": "\\}|(?=\\s*#\\s*endif\\b)",
+							"endCaptures": {
+								"0": {
+									"name": "punctuation.section.block.end.bracket.curly.c"
+								}
+							},
+							"patterns": [
+								{
+									"include": "#special_block"
+								},
+								{
+									"include": "$base"
+								}
+							]
+						},
+						{
+							"include": "$base"
+						}
+					]
+				}
+			]
 		}
 	}
 }
\ No newline at end of file
diff --git a/arduino-ide-extension/src/browser/data/arduino.color-theme.json b/arduino-ide-extension/src/browser/data/arduino.color-theme.json
index 6a10fedf..2c34fff0 100644
--- a/arduino-ide-extension/src/browser/data/arduino.color-theme.json
+++ b/arduino-ide-extension/src/browser/data/arduino.color-theme.json
@@ -2,493 +2,89 @@
 	"tokenColors": [
 		{
 			"settings": {
-				"background": "#FFFFFF",
-				"foreground": "#000000"
+				"foreground": "#434f54"
 			}
 		},
 		{
-			"name": "Source",
-			"scope": "source",
-			"settings": {
-				"background": "#FFFFFF",
-				"fontStyle": ""
-			}
-		},
-		{
-			"name": "Comment",
+			"name": "Comments",
 			"scope": "comment",
 			"settings": {
-				"fontStyle": "italic",
-				"foreground": "#91a6a6"
+				"foreground": "#95a5a6cc"
 			}
 		},
 		{
-			"name": "Docblock",
-			"scope": "comment.block",
-			"settings": {
-				"fontStyle": "",
-				"foreground": "#91a6a6"
-			}
-		},
-		{
-			"name": "Docblock tag",
-			"scope": "keyword.other.phpdoc",
-			"settings": {
-				"fontStyle": "",
-				"foreground": "#91a6a6"
-			}
-		},
-		{
-			"name": "Core function",
-			"scope": "support.function",
-			"settings": {
-				"fontStyle": "",
-				"foreground": "#6f8100"
-			}
-		},
-		{
-			"name": "Keyword",
+			"name": "Keywords Attributes",
 			"scope": [
-				"keyword",
-				"storage"
+				"storage",
+				"support",
+				"string.quoted.single.c"
 			],
 			"settings": {
-				"fontStyle": "bold",
-				"foreground": "#000000"
+				"foreground": "#00979D"
 			}
 		},
 		{
-			"name": "Keyword operator",
-			"scope": "keyword.operator.assignment",
-			"settings": {
-				"fontStyle": "",
-				"foreground": "#000000"
-			}
-		},
-		{
-			"name": "keyword like new",
-			"scope": "keyword.other.special-method",
-			"settings": {
-				"fontStyle": ""
-			}
-		},
-		{
-			"name": "Function (definition)",
+			"name": "literal",
 			"scope": [
+				"meta.function.c",
 				"entity.name.function",
-				"keyword.other.name-of-parameter.objc",
-				"support.type.exception.python"
+				"meta.function-call.c"
 			],
 			"settings": {
-				"fontStyle": "bold",
-				"foreground": "#000000"
+				"foreground": "#D35400"
 			}
 		},
 		{
-			"name": "Class (definition)",
-			"scope": "entity.name",
-			"settings": {
-				"fontStyle": "bold",
-				"foreground": "#445588"
-			}
-		},
-		{
-			"name": "Number",
-			"scope": "constant.numeric",
-			"settings": {
-				"fontStyle": "",
-				"foreground": "#00b0b3"
-			}
-		},
-		{
-			"name": "Variable",
+			"name": "punctuation",
 			"scope": [
-				"variable.language",
-				"variable.other"
+				"punctuation.section",
+				"meta.function-call.c",
+				"meta.block.c",
+				"meta.function.c",
+				"entity.name.function.preprocessor.c",
+				"meta.preprocessor.macro.c"
 			],
 			"settings": {
-				"fontStyle": "",
-				"foreground": "#00b0b3"
+				"foreground": "#434f54"
 			}
 		},
 		{
-			"name": "Built-in constant",
-			"scope": "constant.language",
-			"settings": {
-				"fontStyle": "bold",
-				"foreground": "#000000"
-			}
-		},
-		{
-			"name": "Variable",
-			"scope": "variable.other.constant.ruby",
-			"settings": {
-				"foreground": "#0F8787"
-			}
-		},
-		{
-			"name": "Built-in constant",
+			"name": "strings",
 			"scope": [
-				"constant.language",
-				"support.function.construct"
+				"string.quoted.double"
 			],
 			"settings": {
-				"fontStyle": "bold",
-				"foreground": "#000000"
+				"foreground": "#005C5F"
 			}
 		},
 		{
-			"name": "String",
-			"scope": "string",
-			"settings": {
-				"background": "#EB104512",
-				"foreground": "#006062"
-			}
-		},
-		{
-			"name": "Inherited class",
-			"scope": "entity.other.inherited-class",
-			"settings": {
-				"fontStyle": "",
-				"foreground": "#0F8787"
-			}
-		},
-		{
-			"name": "Inherited class seperator",
-			"scope": "punctuation.separator.inheritance",
-			"settings": {
-				"fontStyle": "bold",
-				"foreground": "#000000"
-			}
-		},
-		{
-			"name": "punctuation block",
-			"scope": "punctuation.separator.variable",
-			"settings": {
-				"fontStyle": "bold",
-				"foreground": "#000000"
-			}
-		},
-		{
-			"name": "array brackets",
-			"scope": "punctuation.section.array",
-			"settings": {
-				"fontStyle": "bold",
-				"foreground": "#000000"
-			}
-		},
-		{
-			"name": "hash separator",
-			"scope": "punctuation.separator.key-value",
-			"settings": {
-				"fontStyle": "bold",
-				"foreground": "#000000"
-			}
-		},
-		{
-			"name": "() brackets",
-			"scope": "punctuation.section.function",
-			"settings": {
-				"fontStyle": "",
-				"foreground": "#000000"
-			}
-		},
-		{
-			"name": "Method call",
-			"scope": "meta.function-call",
-			"settings": {
-				"fontStyle": "",
-				"foreground": "#108888"
-			}
-		},
-		{
-			"name": "Method call",
-			"scope": "meta.function-call.python",
-			"settings": {
-				"fontStyle": "",
-				"foreground": "#000000"
-			}
-		},
-		{
-			"name": "hash brackets",
-			"scope": "punctuation.section.scope",
-			"settings": {
-				"fontStyle": "",
-				"foreground": "#000000"
-			}
-		},
-		{
-			"name": "Special ruby method",
-			"scope": "keyword.other.special-method.ruby",
-			"settings": {
-				"fontStyle": "bold"
-			}
-		},
-		{
-			"name": "symbol",
-			"scope": "constant.other.symbol",
-			"settings": {
-				"fontStyle": "",
-				"foreground": "#000000"
-			}
-		},
-		{
-			"name": "Support class",
-			"scope": "support.class.ruby",
-			"settings": {
-				"fontStyle": "",
-				"foreground": "#008080"
-			}
-		},
-		{
-			"name": "String.regexp",
-			"scope": "string.regexp",
-			"settings": {
-				"foreground": "#009926"
-			}
-		},
-		{
-			"name": "String embedded source",
-			"scope": "string.quoted source",
-			"settings": {
-				"foreground": "#000000"
-			}
-		},
-		{
-			"name": "doctype punctation",
-			"scope": "meta.tag.sgml.html",
-			"settings": {
-				"fontStyle": "bold",
-				"foreground": "#999999"
-			}
-		},
-		{
-			"name": "doctype declaration",
-			"scope": "entity.name.tag.doctype",
-			"settings": {
-				"fontStyle": "bold",
-				"foreground": "#999999"
-			}
-		},
-		{
-			"name": "doctype string",
-			"scope": "string.quoted.double.doctype",
-			"settings": {
-				"fontStyle": "bold",
-				"foreground": "#999999"
-			}
-		},
-		{
-			"name": "html tag punctuation",
-			"scope": "punctuation.definition.tag",
-			"settings": {
-				"fontStyle": "",
-				"foreground": "#121289"
-			}
-		},
-		{
-			"name": "html tag punctuation",
-			"scope": "entity.name.tag",
-			"settings": {
-				"fontStyle": "",
-				"foreground": "#121289"
-			}
-		},
-		{
-			"name": "html attribute",
-			"scope": "entity.other.attribute-name",
-			"settings": {
-				"fontStyle": "",
-				"foreground": "#0A8585"
-			}
-		},
-		{
-			"name": "html attribute punctation",
-			"scope": "entity.other.attribute-name",
-			"settings": {
-				"fontStyle": "",
-				"foreground": "#0A8585"
-			}
-		},
-		{
-			"name": "erb tags",
-			"scope": "punctuation.section.embedded.ruby",
-			"settings": {
-				"fontStyle": "bold",
-				"foreground": "#999999"
-			}
-		},
-		{
-			"name": "ruby string interpolation",
-			"scope": "source.ruby.embedded.source punctuation.section.embedded.ruby",
-			"settings": {
-				"foreground": "#CF1040"
-			}
-		},
-		{
-			"name": "css brackets",
-			"scope": "punctuation.section.property-list.css",
-			"settings": {
-				"fontStyle": ""
-			}
-		},
-		{
-			"name": "css property",
-			"scope": "support.type.property-name.css",
-			"settings": {
-				"fontStyle": "bold"
-			}
-		},
-		{
-			"name": "css property punctuation",
-			"scope": "punctuation.separator.key-value.css",
-			"settings": {
-				"fontStyle": "",
-				"foreground": "#000000"
-			}
-		},
-		{
-			"name": "css property value",
+			"name": "meta keywords",
 			"scope": [
-				"meta.property-value",
-				"constant.other.color"
+				"keyword.control",
+				"meta.preprocessor.c"
 			],
 			"settings": {
-				"fontStyle": "",
-				"foreground": "#00b0b3"
+				"foreground": "#728E00"
 			}
 		},
 		{
-			"name": "css ending",
-			"scope": "punctuation.terminator.rule.css",
-			"settings": {
-				"fontStyle": "",
-				"foreground": "#000000"
-			}
-		},
-		{
-			"name": "css font",
-			"scope": "support.constant.font-name",
-			"settings": {
-				"fontStyle": "",
-				"foreground": "#000000"
-			}
-		},
-		{
-			"name": "css keyword",
-			"scope": "keyword.other.unit",
-			"settings": {
-				"fontStyle": "",
-				"foreground": "#00b0b3"
-			}
-		},
-		{
-			"name": "pseudo class",
-			"scope": "entity.other.attribute-name.pseudo-class",
-			"settings": {
-				"fontStyle": "",
-				"foreground": "#000000"
-			}
-		},
-		{
-			"name": "css constant property value",
-			"scope": "support.constant.property-value",
-			"settings": {
-				"fontStyle": "bold",
-				"foreground": "#000000"
-			}
-		},
-		{
-			"name": "css attribute class",
-			"scope": "entity.other.attribute-name.class",
-			"settings": {
-				"fontStyle": "bold",
-				"foreground": "#445588"
-			}
-		},
-		{
-			"name": "css attribute id",
-			"scope": "entity.other.attribute-name.id",
-			"settings": {
-				"fontStyle": "bold",
-				"foreground": "#990000"
-			}
-		},
-		{
-			"name": "diff header from",
-			"scope": "meta.diff.header.from-file",
-			"settings": {
-				"background": "#FFDDDD",
-				"fontStyle": "",
-				"foreground": "#000000"
-			}
-		},
-		{
-			"name": "diff header to",
-			"scope": "meta.diff.header.to-file",
-			"settings": {
-				"fontStyle": "",
-				"foreground": "#000000"
-			}
-		},
-		{
-			"name": "diff inserted",
-			"scope": "markup.inserted.diff",
-			"settings": {
-				"fontStyle": ""
-			}
-		},
-		{
-			"name": "diff deleted",
-			"scope": "markup.deleted.diff",
-			"settings": {
-				"background": "#FFDDDD",
-				"fontStyle": "",
-				"foreground": "#000000"
-			}
-		},
-		{
-			"name": "Function Parameters",
-			"scope": "variable.parameter",
-			"settings": {
-				"fontStyle": "italic"
-			}
-		},
-		{
-			"name": "Library object",
+			"name": "numeric preprocessor",
 			"scope": [
-				"support.function",
-				"support.variable",
-				"support.constant",
-				"support.class",
-				"support.type"
+				"meta.preprocessor.macro.c",
+				"constant.numeric.preprocessor.c",
+				"meta.preprocessor.c"
 			],
 			"settings": {
-				"fontStyle": "bold",
-				"foreground": "#4183c4"
-			}
-		},
-		{
-			"name": "Function Meta Call Arguments",
-			"scope": "meta.function-call.arguments",
-			"settings": {
-				"fontStyle": "italic"
-			}
-		},
-		{
-			"name": "Function Call",
-			"scope": "meta.function-call",
-			"settings": {
-				"fontStyle": ""
+				"foreground": "#434f54"
 			}
 		}
 	],
 	"colors": {
 		"editor.background": "#FFFFFF",
-		"editorCursor.foreground": "#000000",
-		"editor.foreground": "#000000",
+		"editorCursor.foreground": "#434f54",
+		"editor.foreground": "#434f54",
 		"editorWhitespace.foreground": "#BFBFBF",
-		"editor.lineHighlightBackground": "#00000010",
+		"editor.lineHighlightBackground": "#434f5410",
 		"editor.selectionBackground": "#ffcb00"
 	},
 	"name": "Arduino"
diff --git a/yarn.lock b/yarn.lock
index 6953e895..71ae5093 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -880,11 +880,11 @@
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd"
 
-"@theia/application-manager@0.8.0-next.33be284d":
-  version "0.8.0-next.33be284d"
-  resolved "https://registry.yarnpkg.com/@theia/application-manager/-/application-manager-0.8.0-next.33be284d.tgz#044db8ed13e5568868fdce990de90c5f989e1092"
+"@theia/application-manager@0.9.0-next.fa15670e":
+  version "0.9.0-next.fa15670e"
+  resolved "https://registry.yarnpkg.com/@theia/application-manager/-/application-manager-0.9.0-next.fa15670e.tgz#8c68a2aefbd11d9ed8804aed0c86250221abb080"
   dependencies:
-    "@theia/application-package" "0.8.0-next.33be284d"
+    "@theia/application-package" "0.9.0-next.fa15670e"
     "@types/fs-extra" "^4.0.2"
     bunyan "^1.8.10"
     circular-dependency-plugin "^5.0.0"
@@ -905,9 +905,9 @@
     webpack-cli "2.0.12"
     worker-loader "^1.1.1"
 
-"@theia/application-package@0.8.0-next.33be284d":
-  version "0.8.0-next.33be284d"
-  resolved "https://registry.yarnpkg.com/@theia/application-package/-/application-package-0.8.0-next.33be284d.tgz#2ddcffa7745c8644332059629d1cc7716b6121cd"
+"@theia/application-package@0.9.0-next.fa15670e":
+  version "0.9.0-next.fa15670e"
+  resolved "https://registry.yarnpkg.com/@theia/application-package/-/application-package-0.9.0-next.fa15670e.tgz#7e190ce2bdbef694e5211e04e13473420901f431"
   dependencies:
     "@types/fs-extra" "^4.0.2"
     "@types/request" "^2.0.3"
@@ -921,18 +921,18 @@
     write-json-file "^2.2.0"
 
 "@theia/cli@next":
-  version "0.8.0-next.33be284d"
-  resolved "https://registry.yarnpkg.com/@theia/cli/-/cli-0.8.0-next.33be284d.tgz#5c708f4f5199ee797b6e105d5261ed5d7531b93b"
+  version "0.9.0-next.fa15670e"
+  resolved "https://registry.yarnpkg.com/@theia/cli/-/cli-0.9.0-next.fa15670e.tgz#4a6ba55261b6a85c8abf0a0bf1966c69c7aa6b57"
   dependencies:
-    "@theia/application-manager" "0.8.0-next.33be284d"
+    "@theia/application-manager" "0.9.0-next.fa15670e"
 
-"@theia/core@0.8.0-next.33be284d", "@theia/core@next":
-  version "0.8.0-next.33be284d"
-  resolved "https://registry.yarnpkg.com/@theia/core/-/core-0.8.0-next.33be284d.tgz#9c15fca7ecbb2364a46f53134d474f3c8df99511"
+"@theia/core@0.9.0-next.fa15670e", "@theia/core@next":
+  version "0.9.0-next.fa15670e"
+  resolved "https://registry.yarnpkg.com/@theia/core/-/core-0.9.0-next.fa15670e.tgz#3687666fcff89fb45e11712f6f40369cc3662eed"
   dependencies:
     "@phosphor/widgets" "^1.5.0"
     "@primer/octicons-react" "^9.0.0"
-    "@theia/application-package" "0.8.0-next.33be284d"
+    "@theia/application-package" "0.9.0-next.fa15670e"
     "@types/body-parser" "^1.16.4"
     "@types/bunyan" "^1.8.0"
     "@types/express" "^4.16.0"
@@ -969,19 +969,19 @@
     ws "^5.2.2"
     yargs "^11.1.0"
 
-"@theia/editor@0.8.0-next.33be284d", "@theia/editor@next":
-  version "0.8.0-next.33be284d"
-  resolved "https://registry.yarnpkg.com/@theia/editor/-/editor-0.8.0-next.33be284d.tgz#5163ee81ed2bd2f8f9cd1098040b5fba349d092d"
+"@theia/editor@0.9.0-next.fa15670e", "@theia/editor@next":
+  version "0.9.0-next.fa15670e"
+  resolved "https://registry.yarnpkg.com/@theia/editor/-/editor-0.9.0-next.fa15670e.tgz#ae25ba968abfa3a26449c1c7f7b4a9ddbb98bd46"
   dependencies:
-    "@theia/core" "0.8.0-next.33be284d"
-    "@theia/languages" "0.8.0-next.33be284d"
-    "@theia/variable-resolver" "0.8.0-next.33be284d"
+    "@theia/core" "0.9.0-next.fa15670e"
+    "@theia/languages" "0.9.0-next.fa15670e"
+    "@theia/variable-resolver" "0.9.0-next.fa15670e"
     "@types/base64-arraybuffer" "0.1.0"
     base64-arraybuffer "^0.1.5"
 
 "@theia/electron@next":
-  version "0.8.0-next.33be284d"
-  resolved "https://registry.yarnpkg.com/@theia/electron/-/electron-0.8.0-next.33be284d.tgz#9ec2745cd07d7fa505a28781e35f92025928e2b6"
+  version "0.9.0-next.fa15670e"
+  resolved "https://registry.yarnpkg.com/@theia/electron/-/electron-0.9.0-next.fa15670e.tgz#b89db430f1672864414d72e09dca3a1009243235"
   dependencies:
     electron "^3.1.7"
     electron-download "^4.1.1"
@@ -993,25 +993,24 @@
     yargs "^11.1.0"
 
 "@theia/file-search@next":
-  version "0.8.0-next.33be284d"
-  resolved "https://registry.yarnpkg.com/@theia/file-search/-/file-search-0.8.0-next.33be284d.tgz#ca9d0443b832503f4ece8d409171aad76197bbaa"
+  version "0.9.0-next.fa15670e"
+  resolved "https://registry.yarnpkg.com/@theia/file-search/-/file-search-0.9.0-next.fa15670e.tgz#2763435e7b860b9e7b4dbcd2de42e9fc32de0779"
   dependencies:
-    "@theia/core" "0.8.0-next.33be284d"
-    "@theia/editor" "0.8.0-next.33be284d"
-    "@theia/filesystem" "0.8.0-next.33be284d"
-    "@theia/process" "0.8.0-next.33be284d"
-    "@theia/workspace" "0.8.0-next.33be284d"
+    "@theia/core" "0.9.0-next.fa15670e"
+    "@theia/editor" "0.9.0-next.fa15670e"
+    "@theia/filesystem" "0.9.0-next.fa15670e"
+    "@theia/process" "0.9.0-next.fa15670e"
+    "@theia/workspace" "0.9.0-next.fa15670e"
     fuzzy "^0.1.3"
     vscode-ripgrep "^1.2.4"
 
-"@theia/filesystem@0.8.0-next.33be284d", "@theia/filesystem@next":
-  version "0.8.0-next.33be284d"
-  resolved "https://registry.yarnpkg.com/@theia/filesystem/-/filesystem-0.8.0-next.33be284d.tgz#6d5fdedb62a610a074ae8c204e8def373897e23a"
+"@theia/filesystem@0.9.0-next.fa15670e", "@theia/filesystem@next":
+  version "0.9.0-next.fa15670e"
+  resolved "https://registry.yarnpkg.com/@theia/filesystem/-/filesystem-0.9.0-next.fa15670e.tgz#c6ff2ac79c933a69aa6f427a0cbb9f3a4ea31438"
   dependencies:
-    "@theia/core" "0.8.0-next.33be284d"
+    "@theia/core" "0.9.0-next.fa15670e"
     "@types/body-parser" "^1.17.0"
     "@types/fs-extra" "^4.0.2"
-    "@types/mime-types" "^2.1.0"
     "@types/rimraf" "^2.0.2"
     "@types/tar-fs" "^1.16.1"
     "@types/touch" "0.0.1"
@@ -1020,7 +1019,6 @@
     drivelist "^6.4.3"
     fs-extra "^4.0.2"
     http-status-codes "^1.3.0"
-    mime-types "^2.1.18"
     minimatch "^3.0.4"
     mv "^2.1.1"
     rimraf "^2.6.2"
@@ -1030,54 +1028,54 @@
     uuid "^3.2.1"
     zip-dir "^1.0.2"
 
-"@theia/json@0.8.0-next.33be284d":
-  version "0.8.0-next.33be284d"
-  resolved "https://registry.yarnpkg.com/@theia/json/-/json-0.8.0-next.33be284d.tgz#632e5388a0afc3785b1db095652afe9c874a8c2d"
+"@theia/json@0.9.0-next.fa15670e":
+  version "0.9.0-next.fa15670e"
+  resolved "https://registry.yarnpkg.com/@theia/json/-/json-0.9.0-next.fa15670e.tgz#3ca1d82774b05ed080652da4d290e41674ea790b"
   dependencies:
-    "@theia/core" "0.8.0-next.33be284d"
-    "@theia/languages" "0.8.0-next.33be284d"
-    "@theia/monaco" "0.8.0-next.33be284d"
+    "@theia/core" "0.9.0-next.fa15670e"
+    "@theia/languages" "0.9.0-next.fa15670e"
+    "@theia/monaco" "0.9.0-next.fa15670e"
     vscode-json-languageserver "^1.0.1"
 
-"@theia/languages@0.8.0-next.33be284d", "@theia/languages@next":
-  version "0.8.0-next.33be284d"
-  resolved "https://registry.yarnpkg.com/@theia/languages/-/languages-0.8.0-next.33be284d.tgz#0560effb0c8c0f385b6399028c85aab1365b40dc"
+"@theia/languages@0.9.0-next.fa15670e", "@theia/languages@next":
+  version "0.9.0-next.fa15670e"
+  resolved "https://registry.yarnpkg.com/@theia/languages/-/languages-0.9.0-next.fa15670e.tgz#09b532bf4b1fa8af1c3aab21cbbc05bc2533c510"
   dependencies:
-    "@theia/core" "0.8.0-next.33be284d"
-    "@theia/output" "0.8.0-next.33be284d"
-    "@theia/process" "0.8.0-next.33be284d"
-    "@theia/workspace" "0.8.0-next.33be284d"
+    "@theia/core" "0.9.0-next.fa15670e"
+    "@theia/output" "0.9.0-next.fa15670e"
+    "@theia/process" "0.9.0-next.fa15670e"
+    "@theia/workspace" "0.9.0-next.fa15670e"
     "@typefox/monaco-editor-core" "^0.14.6"
     "@types/uuid" "^3.4.3"
     monaco-languageclient "^0.9.0"
     uuid "^3.2.1"
 
-"@theia/markers@0.8.0-next.33be284d", "@theia/markers@next":
-  version "0.8.0-next.33be284d"
-  resolved "https://registry.yarnpkg.com/@theia/markers/-/markers-0.8.0-next.33be284d.tgz#0fe95816c0c2280565a67e10510dd3cecbbebb1f"
+"@theia/markers@0.9.0-next.fa15670e", "@theia/markers@next":
+  version "0.9.0-next.fa15670e"
+  resolved "https://registry.yarnpkg.com/@theia/markers/-/markers-0.9.0-next.fa15670e.tgz#e66abc49137b39c4a078fd4507bc0df4ee4505f9"
   dependencies:
-    "@theia/core" "0.8.0-next.33be284d"
-    "@theia/filesystem" "0.8.0-next.33be284d"
-    "@theia/navigator" "0.8.0-next.33be284d"
-    "@theia/workspace" "0.8.0-next.33be284d"
+    "@theia/core" "0.9.0-next.fa15670e"
+    "@theia/filesystem" "0.9.0-next.fa15670e"
+    "@theia/navigator" "0.9.0-next.fa15670e"
+    "@theia/workspace" "0.9.0-next.fa15670e"
 
 "@theia/messages@next":
-  version "0.8.0-next.33be284d"
-  resolved "https://registry.yarnpkg.com/@theia/messages/-/messages-0.8.0-next.33be284d.tgz#35dfa0a6202d34b034a39254fac019fad0c09313"
+  version "0.9.0-next.fa15670e"
+  resolved "https://registry.yarnpkg.com/@theia/messages/-/messages-0.9.0-next.fa15670e.tgz#9d798b1062b1de16152bebddea94029d1c3941ac"
   dependencies:
-    "@theia/core" "0.8.0-next.33be284d"
+    "@theia/core" "0.9.0-next.fa15670e"
 
-"@theia/monaco@0.8.0-next.33be284d", "@theia/monaco@next":
-  version "0.8.0-next.33be284d"
-  resolved "https://registry.yarnpkg.com/@theia/monaco/-/monaco-0.8.0-next.33be284d.tgz#9c6e25d4e52d75183339713d02d94682e552131d"
+"@theia/monaco@0.9.0-next.fa15670e", "@theia/monaco@next":
+  version "0.9.0-next.fa15670e"
+  resolved "https://registry.yarnpkg.com/@theia/monaco/-/monaco-0.9.0-next.fa15670e.tgz#8ee5302acbe43791d928b49c1ead7991134ae11b"
   dependencies:
-    "@theia/core" "0.8.0-next.33be284d"
-    "@theia/editor" "0.8.0-next.33be284d"
-    "@theia/filesystem" "0.8.0-next.33be284d"
-    "@theia/languages" "0.8.0-next.33be284d"
-    "@theia/markers" "0.8.0-next.33be284d"
-    "@theia/outline-view" "0.8.0-next.33be284d"
-    "@theia/workspace" "0.8.0-next.33be284d"
+    "@theia/core" "0.9.0-next.fa15670e"
+    "@theia/editor" "0.9.0-next.fa15670e"
+    "@theia/filesystem" "0.9.0-next.fa15670e"
+    "@theia/languages" "0.9.0-next.fa15670e"
+    "@theia/markers" "0.9.0-next.fa15670e"
+    "@theia/outline-view" "0.9.0-next.fa15670e"
+    "@theia/workspace" "0.9.0-next.fa15670e"
     deepmerge "2.0.1"
     jsonc-parser "^2.0.2"
     monaco-css "^2.0.1"
@@ -1085,13 +1083,13 @@
     onigasm "2.2.1"
     vscode-textmate "^4.0.1"
 
-"@theia/navigator@0.8.0-next.33be284d", "@theia/navigator@next":
-  version "0.8.0-next.33be284d"
-  resolved "https://registry.yarnpkg.com/@theia/navigator/-/navigator-0.8.0-next.33be284d.tgz#3ebd63abdebe4c63f9abe886c169c692c5a6ef52"
+"@theia/navigator@0.9.0-next.fa15670e", "@theia/navigator@next":
+  version "0.9.0-next.fa15670e"
+  resolved "https://registry.yarnpkg.com/@theia/navigator/-/navigator-0.9.0-next.fa15670e.tgz#00cbcd1a10d6ad064da94b7f5996da8e165c5598"
   dependencies:
-    "@theia/core" "0.8.0-next.33be284d"
-    "@theia/filesystem" "0.8.0-next.33be284d"
-    "@theia/workspace" "0.8.0-next.33be284d"
+    "@theia/core" "0.9.0-next.fa15670e"
+    "@theia/filesystem" "0.9.0-next.fa15670e"
+    "@theia/workspace" "0.9.0-next.fa15670e"
     fuzzy "^0.1.3"
     minimatch "^3.0.4"
 
@@ -1101,78 +1099,78 @@
   dependencies:
     nan "2.10.0"
 
-"@theia/outline-view@0.8.0-next.33be284d", "@theia/outline-view@next":
-  version "0.8.0-next.33be284d"
-  resolved "https://registry.yarnpkg.com/@theia/outline-view/-/outline-view-0.8.0-next.33be284d.tgz#744ce2f3fe93abe1ab36ec6de9ef328fdc9b5f68"
+"@theia/outline-view@0.9.0-next.fa15670e", "@theia/outline-view@next":
+  version "0.9.0-next.fa15670e"
+  resolved "https://registry.yarnpkg.com/@theia/outline-view/-/outline-view-0.9.0-next.fa15670e.tgz#8c729c534f50835aff9b8e8db17509f109ee4bf0"
   dependencies:
-    "@theia/core" "0.8.0-next.33be284d"
+    "@theia/core" "0.9.0-next.fa15670e"
 
-"@theia/output@0.8.0-next.33be284d":
-  version "0.8.0-next.33be284d"
-  resolved "https://registry.yarnpkg.com/@theia/output/-/output-0.8.0-next.33be284d.tgz#70b39b2e1e956ff188c8f31cfc4815fa37d0831a"
+"@theia/output@0.9.0-next.fa15670e":
+  version "0.9.0-next.fa15670e"
+  resolved "https://registry.yarnpkg.com/@theia/output/-/output-0.9.0-next.fa15670e.tgz#ee94e5cf1e14d183d6503c5c9b7ac8507f02d6eb"
   dependencies:
-    "@theia/core" "0.8.0-next.33be284d"
+    "@theia/core" "0.9.0-next.fa15670e"
 
 "@theia/preferences@next":
-  version "0.8.0-next.33be284d"
-  resolved "https://registry.yarnpkg.com/@theia/preferences/-/preferences-0.8.0-next.33be284d.tgz#47e7f64204feddd4a1ae0f59d0b8c6c41ade2e79"
+  version "0.9.0-next.fa15670e"
+  resolved "https://registry.yarnpkg.com/@theia/preferences/-/preferences-0.9.0-next.fa15670e.tgz#1464ab952986efe4e36da47789d8f54dc14b97d8"
   dependencies:
-    "@theia/core" "0.8.0-next.33be284d"
-    "@theia/editor" "0.8.0-next.33be284d"
-    "@theia/filesystem" "0.8.0-next.33be284d"
-    "@theia/json" "0.8.0-next.33be284d"
-    "@theia/monaco" "0.8.0-next.33be284d"
-    "@theia/userstorage" "0.8.0-next.33be284d"
-    "@theia/workspace" "0.8.0-next.33be284d"
+    "@theia/core" "0.9.0-next.fa15670e"
+    "@theia/editor" "0.9.0-next.fa15670e"
+    "@theia/filesystem" "0.9.0-next.fa15670e"
+    "@theia/json" "0.9.0-next.fa15670e"
+    "@theia/monaco" "0.9.0-next.fa15670e"
+    "@theia/userstorage" "0.9.0-next.fa15670e"
+    "@theia/workspace" "0.9.0-next.fa15670e"
     "@types/fs-extra" "^4.0.2"
     fs-extra "^4.0.2"
     jsonc-parser "^2.0.2"
 
-"@theia/process@0.8.0-next.33be284d", "@theia/process@next":
-  version "0.8.0-next.33be284d"
-  resolved "https://registry.yarnpkg.com/@theia/process/-/process-0.8.0-next.33be284d.tgz#350fa282ae5f2686efdcd391af3e4c4fc178e5f9"
+"@theia/process@0.9.0-next.fa15670e", "@theia/process@next":
+  version "0.9.0-next.fa15670e"
+  resolved "https://registry.yarnpkg.com/@theia/process/-/process-0.9.0-next.fa15670e.tgz#87f5cb9526d04d993cca0cd19b072e825e177d80"
   dependencies:
-    "@theia/core" "0.8.0-next.33be284d"
+    "@theia/core" "0.9.0-next.fa15670e"
     "@theia/node-pty" "0.7.8-theia004"
     string-argv "^0.1.1"
 
 "@theia/terminal@next":
-  version "0.8.0-next.33be284d"
-  resolved "https://registry.yarnpkg.com/@theia/terminal/-/terminal-0.8.0-next.33be284d.tgz#56d5eaabf0f6e5c03249bb09344e07ffeeb6066f"
+  version "0.9.0-next.fa15670e"
+  resolved "https://registry.yarnpkg.com/@theia/terminal/-/terminal-0.9.0-next.fa15670e.tgz#f478838ddc97d099b704915e976bd98c126ff69e"
   dependencies:
-    "@theia/core" "0.8.0-next.33be284d"
-    "@theia/editor" "0.8.0-next.33be284d"
-    "@theia/filesystem" "0.8.0-next.33be284d"
-    "@theia/process" "0.8.0-next.33be284d"
-    "@theia/workspace" "0.8.0-next.33be284d"
+    "@theia/core" "0.9.0-next.fa15670e"
+    "@theia/editor" "0.9.0-next.fa15670e"
+    "@theia/filesystem" "0.9.0-next.fa15670e"
+    "@theia/process" "0.9.0-next.fa15670e"
+    "@theia/workspace" "0.9.0-next.fa15670e"
     xterm "3.13.0"
 
 "@theia/textmate-grammars@next":
-  version "0.8.0-next.33be284d"
-  resolved "https://registry.yarnpkg.com/@theia/textmate-grammars/-/textmate-grammars-0.8.0-next.33be284d.tgz#fbc763df13348ee4aee41af1044320f6e71b4dba"
+  version "0.9.0-next.fa15670e"
+  resolved "https://registry.yarnpkg.com/@theia/textmate-grammars/-/textmate-grammars-0.9.0-next.fa15670e.tgz#22d497d9ae0c375c7605014d623a851121921bec"
   dependencies:
-    "@theia/monaco" "0.8.0-next.33be284d"
+    "@theia/monaco" "0.9.0-next.fa15670e"
 
-"@theia/userstorage@0.8.0-next.33be284d":
-  version "0.8.0-next.33be284d"
-  resolved "https://registry.yarnpkg.com/@theia/userstorage/-/userstorage-0.8.0-next.33be284d.tgz#2649819ba9c3b5d291bf98513e248dbaaf9b77c7"
+"@theia/userstorage@0.9.0-next.fa15670e":
+  version "0.9.0-next.fa15670e"
+  resolved "https://registry.yarnpkg.com/@theia/userstorage/-/userstorage-0.9.0-next.fa15670e.tgz#a41feb73570fc38661c5be7ff0f25311d1ea204e"
   dependencies:
-    "@theia/core" "0.8.0-next.33be284d"
-    "@theia/filesystem" "0.8.0-next.33be284d"
+    "@theia/core" "0.9.0-next.fa15670e"
+    "@theia/filesystem" "0.9.0-next.fa15670e"
 
-"@theia/variable-resolver@0.8.0-next.33be284d":
-  version "0.8.0-next.33be284d"
-  resolved "https://registry.yarnpkg.com/@theia/variable-resolver/-/variable-resolver-0.8.0-next.33be284d.tgz#d4b7c6c8d6e93b5d8ae2b498d6d7194a5db493cc"
+"@theia/variable-resolver@0.9.0-next.fa15670e":
+  version "0.9.0-next.fa15670e"
+  resolved "https://registry.yarnpkg.com/@theia/variable-resolver/-/variable-resolver-0.9.0-next.fa15670e.tgz#20e45deaa6075fd2da8edd9fc83b09cfd7f18859"
   dependencies:
-    "@theia/core" "0.8.0-next.33be284d"
+    "@theia/core" "0.9.0-next.fa15670e"
 
-"@theia/workspace@0.8.0-next.33be284d", "@theia/workspace@next":
-  version "0.8.0-next.33be284d"
-  resolved "https://registry.yarnpkg.com/@theia/workspace/-/workspace-0.8.0-next.33be284d.tgz#8b6d4802f48f23e615468e756c84535fc56edcfe"
+"@theia/workspace@0.9.0-next.fa15670e", "@theia/workspace@next":
+  version "0.9.0-next.fa15670e"
+  resolved "https://registry.yarnpkg.com/@theia/workspace/-/workspace-0.9.0-next.fa15670e.tgz#1ff8f49f381d16fad9e8d2a488536759b0f71c88"
   dependencies:
-    "@theia/core" "0.8.0-next.33be284d"
-    "@theia/filesystem" "0.8.0-next.33be284d"
-    "@theia/variable-resolver" "0.8.0-next.33be284d"
+    "@theia/core" "0.9.0-next.fa15670e"
+    "@theia/filesystem" "0.9.0-next.fa15670e"
+    "@theia/variable-resolver" "0.9.0-next.fa15670e"
     "@types/fs-extra" "^4.0.2"
     ajv "^6.5.3"
     fs-extra "^4.0.2"
@@ -1270,10 +1268,6 @@
   version "4.14.134"
   resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.134.tgz#9032b440122db3a2a56200e91191996161dde5b9"
 
-"@types/mime-types@^2.1.0":
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@types/mime-types/-/mime-types-2.1.0.tgz#9ca52cda363f699c69466c2a6ccdaad913ea7a73"
-
 "@types/mime@*":
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/@types/mime/-/mime-2.0.1.tgz#dc488842312a7f075149312905b5e3c0b054c79d"
@@ -6539,7 +6533,7 @@ mime-db@1.40.0:
   version "1.40.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz#a65057e998db090f732a68f6c276d387d4126c32"
 
-mime-types@^2.1.12, mime-types@^2.1.18, mime-types@~2.1.19, mime-types@~2.1.24:
+mime-types@^2.1.12, mime-types@~2.1.19, mime-types@~2.1.24:
   version "2.1.24"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.24.tgz#b6f8d0b3e951efb77dedeca194cff6d16f676f81"
   dependencies: