From 744669a9df4d3a26361792304377f3c7e55e6aac Mon Sep 17 00:00:00 2001 From: Jonathan Dierksen Date: Fri, 28 Sep 2018 11:09:07 -0700 Subject: [PATCH] Update swift integration test results. --- .../swift/test/colorize-fixtures/test.swift | 5 +- .../test/colorize-results/test_swift.json | 532 +++++++++++++----- 2 files changed, 391 insertions(+), 146 deletions(-) diff --git a/extensions/swift/test/colorize-fixtures/test.swift b/extensions/swift/test/colorize-fixtures/test.swift index 8b6ce3b50b9..189fa46fdc4 100644 --- a/extensions/swift/test/colorize-fixtures/test.swift +++ b/extensions/swift/test/colorize-fixtures/test.swift @@ -1,5 +1,8 @@ var teamScore = 0 var greeting = "Hello!" +var multiLineString = """ + This is a multi-line string! +""" func hasAnyMatches(list: [Int], condition: (Int) -> Bool) -> Bool { for item in list { if condition(item) { @@ -7,4 +10,4 @@ func hasAnyMatches(list: [Int], condition: (Int) -> Bool) -> Bool { } } return false -} \ No newline at end of file +} diff --git a/extensions/swift/test/colorize-results/test_swift.json b/extensions/swift/test/colorize-results/test_swift.json index cf3e2493522..8512da234c9 100644 --- a/extensions/swift/test/colorize-results/test_swift.json +++ b/extensions/swift/test/colorize-results/test_swift.json @@ -1,13 +1,13 @@ [ { "c": "var", - "t": "source.swift storage.type.swift", + "t": "source.swift keyword.other.declaration-specifier.swift", "r": { - "dark_plus": "storage.type: #569CD6", - "light_plus": "storage.type: #0000FF", - "dark_vs": "storage.type: #569CD6", - "light_vs": "storage.type: #0000FF", - "hc_black": "storage.type: #569CD6" + "dark_plus": "keyword: #569CD6", + "light_plus": "keyword: #0000FF", + "dark_vs": "keyword: #569CD6", + "light_vs": "keyword: #0000FF", + "hc_black": "keyword: #569CD6" } }, { @@ -23,7 +23,7 @@ }, { "c": "=", - "t": "source.swift keyword.operator.swift", + "t": "source.swift keyword.operator.custom.infix.swift", "r": { "dark_plus": "keyword.operator: #D4D4D4", "light_plus": "keyword.operator: #000000", @@ -45,7 +45,7 @@ }, { "c": "0", - "t": "source.swift constant.numeric.swift", + "t": "source.swift constant.numeric.integer.decimal.swift", "r": { "dark_plus": "constant.numeric: #B5CEA8", "light_plus": "constant.numeric: #09885A", @@ -56,13 +56,13 @@ }, { "c": "var", - "t": "source.swift storage.type.swift", + "t": "source.swift keyword.other.declaration-specifier.swift", "r": { - "dark_plus": "storage.type: #569CD6", - "light_plus": "storage.type: #0000FF", - "dark_vs": "storage.type: #569CD6", - "light_vs": "storage.type: #0000FF", - "hc_black": "storage.type: #569CD6" + "dark_plus": "keyword: #569CD6", + "light_plus": "keyword: #0000FF", + "dark_vs": "keyword: #569CD6", + "light_vs": "keyword: #0000FF", + "hc_black": "keyword: #569CD6" } }, { @@ -78,7 +78,7 @@ }, { "c": "=", - "t": "source.swift keyword.operator.swift", + "t": "source.swift keyword.operator.custom.infix.swift", "r": { "dark_plus": "keyword.operator: #D4D4D4", "light_plus": "keyword.operator: #000000", @@ -100,7 +100,7 @@ }, { "c": "\"", - "t": "source.swift string.quoted.double.swift punctuation.definition.string.begin.swift", + "t": "source.swift string.quoted.double.single-line.swift punctuation.definition.string.begin.swift", "r": { "dark_plus": "string: #CE9178", "light_plus": "string: #A31515", @@ -111,7 +111,7 @@ }, { "c": "Hello!", - "t": "source.swift string.quoted.double.swift", + "t": "source.swift string.quoted.double.single-line.swift", "r": { "dark_plus": "string: #CE9178", "light_plus": "string: #A31515", @@ -122,7 +122,7 @@ }, { "c": "\"", - "t": "source.swift string.quoted.double.swift punctuation.definition.string.end.swift", + "t": "source.swift string.quoted.double.single-line.swift punctuation.definition.string.end.swift", "r": { "dark_plus": "string: #CE9178", "light_plus": "string: #A31515", @@ -132,18 +132,18 @@ } }, { - "c": "func hasAnyMatches", - "t": "source.swift entity.name.function.swift", + "c": "var", + "t": "source.swift keyword.other.declaration-specifier.swift", "r": { - "dark_plus": "entity.name.function: #DCDCAA", - "light_plus": "entity.name.function: #795E26", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "entity.name.function: #DCDCAA" + "dark_plus": "keyword: #569CD6", + "light_plus": "keyword: #0000FF", + "dark_vs": "keyword: #569CD6", + "light_vs": "keyword: #0000FF", + "hc_black": "keyword: #569CD6" } }, { - "c": "(list", + "c": " multiLineString ", "t": "source.swift", "r": { "dark_plus": "default: #D4D4D4", @@ -154,8 +154,8 @@ } }, { - "c": ":", - "t": "source.swift keyword.operator.swift", + "c": "=", + "t": "source.swift keyword.operator.custom.infix.swift", "r": { "dark_plus": "keyword.operator: #D4D4D4", "light_plus": "keyword.operator: #000000", @@ -175,64 +175,108 @@ "hc_black": "default: #FFFFFF" } }, + { + "c": "\"\"\"", + "t": "source.swift string.quoted.double.block.swift punctuation.definition.string.begin.swift", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178" + } + }, + { + "c": " This is a multi-line string!", + "t": "source.swift string.quoted.double.block.swift", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178" + } + }, + { + "c": "\"\"\"", + "t": "source.swift string.quoted.double.block.swift punctuation.definition.string.end.swift", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178" + } + }, + { + "c": "func", + "t": "source.swift meta.definition.function.swift storage.type.function.swift", + "r": { + "dark_plus": "storage.type: #569CD6", + "light_plus": "storage.type: #0000FF", + "dark_vs": "storage.type: #569CD6", + "light_vs": "storage.type: #0000FF", + "hc_black": "storage.type: #569CD6" + } + }, + { + "c": " ", + "t": "source.swift meta.definition.function.swift", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF" + } + }, + { + "c": "hasAnyMatches", + "t": "source.swift meta.definition.function.swift entity.name.function.swift", + "r": { + "dark_plus": "entity.name.function: #DCDCAA", + "light_plus": "entity.name.function: #795E26", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "entity.name.function: #DCDCAA" + } + }, + { + "c": "(", + "t": "source.swift meta.definition.function.swift meta.parameter-clause.swift punctuation.definition.parameters.begin.swift", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF" + } + }, + { + "c": "list", + "t": "source.swift meta.definition.function.swift meta.parameter-clause.swift variable.parameter.function.swift entity.name.function.swift", + "r": { + "dark_plus": "entity.name.function: #DCDCAA", + "light_plus": "entity.name.function: #795E26", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "entity.name.function: #DCDCAA" + } + }, + { + "c": ": ", + "t": "source.swift meta.definition.function.swift meta.parameter-clause.swift", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF" + } + }, { "c": "[", - "t": "source.swift keyword.operator.swift", - "r": { - "dark_plus": "keyword.operator: #D4D4D4", - "light_plus": "keyword.operator: #000000", - "dark_vs": "keyword.operator: #D4D4D4", - "light_vs": "keyword.operator: #000000", - "hc_black": "keyword.operator: #D4D4D4" - } - }, - { - "c": "Int", - "t": "source.swift support.type.swift", - "r": { - "dark_plus": "support.type: #4EC9B0", - "light_plus": "support.type: #267F99", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "support.type: #4EC9B0" - } - }, - { - "c": "],", - "t": "source.swift keyword.operator.swift", - "r": { - "dark_plus": "keyword.operator: #D4D4D4", - "light_plus": "keyword.operator: #000000", - "dark_vs": "keyword.operator: #D4D4D4", - "light_vs": "keyword.operator: #000000", - "hc_black": "keyword.operator: #D4D4D4" - } - }, - { - "c": " condition", - "t": "source.swift", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF" - } - }, - { - "c": ":", - "t": "source.swift keyword.operator.swift", - "r": { - "dark_plus": "keyword.operator: #D4D4D4", - "light_plus": "keyword.operator: #000000", - "dark_vs": "keyword.operator: #D4D4D4", - "light_vs": "keyword.operator: #000000", - "hc_black": "keyword.operator: #D4D4D4" - } - }, - { - "c": " (", - "t": "source.swift", + "t": "source.swift meta.definition.function.swift meta.parameter-clause.swift punctuation.section.collection-type.begin.swift", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -243,7 +287,7 @@ }, { "c": "Int", - "t": "source.swift support.type.swift", + "t": "source.swift meta.definition.function.swift meta.parameter-clause.swift support.type.swift", "r": { "dark_plus": "support.type: #4EC9B0", "light_plus": "support.type: #267F99", @@ -253,8 +297,85 @@ } }, { - "c": ") ", - "t": "source.swift", + "c": "]", + "t": "source.swift meta.definition.function.swift meta.parameter-clause.swift punctuation.section.collection-type.end.swift", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF" + } + }, + { + "c": ", ", + "t": "source.swift meta.definition.function.swift meta.parameter-clause.swift", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF" + } + }, + { + "c": "condition", + "t": "source.swift meta.definition.function.swift meta.parameter-clause.swift variable.parameter.function.swift entity.name.function.swift", + "r": { + "dark_plus": "entity.name.function: #DCDCAA", + "light_plus": "entity.name.function: #795E26", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "entity.name.function: #DCDCAA" + } + }, + { + "c": ": ", + "t": "source.swift meta.definition.function.swift meta.parameter-clause.swift", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF" + } + }, + { + "c": "(", + "t": "source.swift meta.definition.function.swift meta.parameter-clause.swift punctuation.section.tuple-type.begin.swift", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF" + } + }, + { + "c": "Int", + "t": "source.swift meta.definition.function.swift meta.parameter-clause.swift support.type.swift", + "r": { + "dark_plus": "support.type: #4EC9B0", + "light_plus": "support.type: #267F99", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "support.type: #4EC9B0" + } + }, + { + "c": ")", + "t": "source.swift meta.definition.function.swift meta.parameter-clause.swift punctuation.section.tuple-type.end.swift", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF" + } + }, + { + "c": " ", + "t": "source.swift meta.definition.function.swift meta.parameter-clause.swift", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -265,7 +386,7 @@ }, { "c": "->", - "t": "source.swift keyword.operator.swift", + "t": "source.swift meta.definition.function.swift meta.parameter-clause.swift keyword.operator.type.function.swift", "r": { "dark_plus": "keyword.operator: #D4D4D4", "light_plus": "keyword.operator: #000000", @@ -276,7 +397,7 @@ }, { "c": " ", - "t": "source.swift", + "t": "source.swift meta.definition.function.swift meta.parameter-clause.swift", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -287,7 +408,7 @@ }, { "c": "Bool", - "t": "source.swift support.type.swift", + "t": "source.swift meta.definition.function.swift meta.parameter-clause.swift support.type.swift", "r": { "dark_plus": "support.type: #4EC9B0", "light_plus": "support.type: #267F99", @@ -297,8 +418,19 @@ } }, { - "c": ") ", - "t": "source.swift", + "c": ")", + "t": "source.swift meta.definition.function.swift meta.parameter-clause.swift punctuation.definition.parameters.end.swift", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF" + } + }, + { + "c": " ", + "t": "source.swift meta.definition.function.swift", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -309,7 +441,7 @@ }, { "c": "->", - "t": "source.swift keyword.operator.swift", + "t": "source.swift meta.definition.function.swift meta.function-result.swift keyword.operator.function-result.swift", "r": { "dark_plus": "keyword.operator: #D4D4D4", "light_plus": "keyword.operator: #000000", @@ -320,7 +452,7 @@ }, { "c": " ", - "t": "source.swift", + "t": "source.swift meta.definition.function.swift meta.function-result.swift", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -331,7 +463,7 @@ }, { "c": "Bool", - "t": "source.swift support.type.swift", + "t": "source.swift meta.definition.function.swift meta.function-result.swift support.type.swift", "r": { "dark_plus": "support.type: #4EC9B0", "light_plus": "support.type: #267F99", @@ -341,8 +473,19 @@ } }, { - "c": " {", - "t": "source.swift", + "c": " ", + "t": "source.swift meta.definition.function.swift meta.function-result.swift", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF" + } + }, + { + "c": "{", + "t": "source.swift meta.definition.function.swift meta.definition.function.body.swift punctuation.section.function.begin.swift", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -353,7 +496,7 @@ }, { "c": " ", - "t": "source.swift", + "t": "source.swift meta.definition.function.swift meta.definition.function.body.swift", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -364,18 +507,18 @@ }, { "c": "for", - "t": "source.swift keyword.statement.swift", + "t": "source.swift meta.definition.function.swift meta.definition.function.body.swift keyword.control.loop.swift", "r": { - "dark_plus": "keyword: #569CD6", - "light_plus": "keyword: #0000FF", - "dark_vs": "keyword: #569CD6", - "light_vs": "keyword: #0000FF", - "hc_black": "keyword: #569CD6" + "dark_plus": "keyword.control: #C586C0", + "light_plus": "keyword.control: #AF00DB", + "dark_vs": "keyword.control: #569CD6", + "light_vs": "keyword.control: #0000FF", + "hc_black": "keyword.control: #C586C0" } }, { "c": " item ", - "t": "source.swift", + "t": "source.swift meta.definition.function.swift meta.definition.function.body.swift", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -386,18 +529,29 @@ }, { "c": "in", - "t": "source.swift keyword.statement.swift", + "t": "source.swift meta.definition.function.swift meta.definition.function.body.swift keyword.control.loop.swift", "r": { - "dark_plus": "keyword: #569CD6", - "light_plus": "keyword: #0000FF", - "dark_vs": "keyword: #569CD6", - "light_vs": "keyword: #0000FF", - "hc_black": "keyword: #569CD6" + "dark_plus": "keyword.control: #C586C0", + "light_plus": "keyword.control: #AF00DB", + "dark_vs": "keyword.control: #569CD6", + "light_vs": "keyword.control: #0000FF", + "hc_black": "keyword.control: #C586C0" } }, { - "c": " list {", - "t": "source.swift", + "c": " list ", + "t": "source.swift meta.definition.function.swift meta.definition.function.body.swift", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF" + } + }, + { + "c": "{", + "t": "source.swift meta.definition.function.swift meta.definition.function.body.swift punctuation.section.scope.begin.swift", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -408,7 +562,7 @@ }, { "c": " ", - "t": "source.swift", + "t": "source.swift meta.definition.function.swift meta.definition.function.body.swift", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -419,18 +573,84 @@ }, { "c": "if", - "t": "source.swift keyword.statement.swift", + "t": "source.swift meta.definition.function.swift meta.definition.function.body.swift keyword.control.branch.swift", "r": { - "dark_plus": "keyword: #569CD6", - "light_plus": "keyword: #0000FF", - "dark_vs": "keyword: #569CD6", - "light_vs": "keyword: #0000FF", - "hc_black": "keyword: #569CD6" + "dark_plus": "keyword.control: #C586C0", + "light_plus": "keyword.control: #AF00DB", + "dark_vs": "keyword.control: #569CD6", + "light_vs": "keyword.control: #0000FF", + "hc_black": "keyword.control: #C586C0" } }, { - "c": " condition(item) {", - "t": "source.swift", + "c": " ", + "t": "source.swift meta.definition.function.swift meta.definition.function.body.swift", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF" + } + }, + { + "c": "condition", + "t": "source.swift meta.definition.function.swift meta.definition.function.body.swift meta.function-call.swift support.function.any-method.swift", + "r": { + "dark_plus": "support.function: #DCDCAA", + "light_plus": "support.function: #795E26", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "support.function: #DCDCAA" + } + }, + { + "c": "(", + "t": "source.swift meta.definition.function.swift meta.definition.function.body.swift meta.function-call.swift punctuation.definition.arguments.begin.swift", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF" + } + }, + { + "c": "item", + "t": "source.swift meta.definition.function.swift meta.definition.function.body.swift meta.function-call.swift", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF" + } + }, + { + "c": ")", + "t": "source.swift meta.definition.function.swift meta.definition.function.body.swift meta.function-call.swift punctuation.definition.arguments.end.swift", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF" + } + }, + { + "c": " ", + "t": "source.swift meta.definition.function.swift meta.definition.function.body.swift", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF" + } + }, + { + "c": "{", + "t": "source.swift meta.definition.function.swift meta.definition.function.body.swift punctuation.section.scope.begin.swift", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -441,7 +661,7 @@ }, { "c": " ", - "t": "source.swift", + "t": "source.swift meta.definition.function.swift meta.definition.function.body.swift", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -452,18 +672,18 @@ }, { "c": "return", - "t": "source.swift keyword.statement.swift", + "t": "source.swift meta.definition.function.swift meta.definition.function.body.swift keyword.control.transfer.swift", "r": { - "dark_plus": "keyword: #569CD6", - "light_plus": "keyword: #0000FF", - "dark_vs": "keyword: #569CD6", - "light_vs": "keyword: #0000FF", - "hc_black": "keyword: #569CD6" + "dark_plus": "keyword.control: #C586C0", + "light_plus": "keyword.control: #AF00DB", + "dark_vs": "keyword.control: #569CD6", + "light_vs": "keyword.control: #0000FF", + "hc_black": "keyword.control: #C586C0" } }, { "c": " ", - "t": "source.swift", + "t": "source.swift meta.definition.function.swift meta.definition.function.body.swift", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -474,7 +694,7 @@ }, { "c": "true", - "t": "source.swift constant.language.swift", + "t": "source.swift meta.definition.function.swift meta.definition.function.body.swift constant.language.boolean.swift", "r": { "dark_plus": "constant.language: #569CD6", "light_plus": "constant.language: #0000FF", @@ -484,8 +704,8 @@ } }, { - "c": " }", - "t": "source.swift", + "c": " ", + "t": "source.swift meta.definition.function.swift meta.definition.function.body.swift", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -495,8 +715,8 @@ } }, { - "c": " }", - "t": "source.swift", + "c": "}", + "t": "source.swift meta.definition.function.swift meta.definition.function.body.swift punctuation.section.scope.end.swift", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -507,7 +727,29 @@ }, { "c": " ", - "t": "source.swift", + "t": "source.swift meta.definition.function.swift meta.definition.function.body.swift", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF" + } + }, + { + "c": "}", + "t": "source.swift meta.definition.function.swift meta.definition.function.body.swift punctuation.section.scope.end.swift", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF" + } + }, + { + "c": " ", + "t": "source.swift meta.definition.function.swift meta.definition.function.body.swift", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -518,18 +760,18 @@ }, { "c": "return", - "t": "source.swift keyword.statement.swift", + "t": "source.swift meta.definition.function.swift meta.definition.function.body.swift keyword.control.transfer.swift", "r": { - "dark_plus": "keyword: #569CD6", - "light_plus": "keyword: #0000FF", - "dark_vs": "keyword: #569CD6", - "light_vs": "keyword: #0000FF", - "hc_black": "keyword: #569CD6" + "dark_plus": "keyword.control: #C586C0", + "light_plus": "keyword.control: #AF00DB", + "dark_vs": "keyword.control: #569CD6", + "light_vs": "keyword.control: #0000FF", + "hc_black": "keyword.control: #C586C0" } }, { "c": " ", - "t": "source.swift", + "t": "source.swift meta.definition.function.swift meta.definition.function.body.swift", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -540,7 +782,7 @@ }, { "c": "false", - "t": "source.swift constant.language.swift", + "t": "source.swift meta.definition.function.swift meta.definition.function.body.swift constant.language.boolean.swift", "r": { "dark_plus": "constant.language: #569CD6", "light_plus": "constant.language: #0000FF", @@ -551,7 +793,7 @@ }, { "c": "}", - "t": "source.swift", + "t": "source.swift meta.definition.function.swift meta.definition.function.body.swift punctuation.section.function.end.swift", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000",