提交 0469b008 编写于 作者: S Sardorbek 提交者: Matt Bierner

add toml fixes: #51704 (#59089)

* add toml fixes: #51704

* add thirdparty notices
上级 e19c9ba8
......@@ -66,7 +66,7 @@ This project incorporates components from the projects listed below. The origina
59. vscode-logfile-highlighter version 1.2.0 (https://github.com/emilast/vscode-logfile-highlighter)
60. vscode-swift version 0.0.1 (https://github.com/owensd/vscode-swift)
61. Web Background Synchronization (https://github.com/WICG/BackgroundSync)
62. textmate/toml.tmbundle (https://github.com/textmate/toml.tmbundle)
%% atom/language-c NOTICES AND INFORMATION BEGIN HERE
=========================================
......
test/**
OSSREADME.json
\ No newline at end of file
// ATTENTION - THIS DIRECTORY CONTAINS THIRD PARTY OPEN SOURCE MATERIALS:
[{
"name": "textmate/toml.tmbundle",
"version": "0.0.0",
"license": "TextMate Bundle License",
"repositoryURL": "https://github.com/textmate/toml.tmbundle",
"licenseDetail": [
"Copyright (c) https://github.com/infininight and https://github.com/mojombo",
"Permission to copy, use, modify, sell and distribute this",
"software is granted. This software is provided \"as is\" without",
"express or implied warranty, and with no claim as to its",
"suitability for any purpose",
"",
"An exception is made for files in readable text which contain their own license information, or files where an accompanying",
"file exists (in the same directory) with a “-license” suffix added to the base-name name of the original file, and an extension .",
"of txt, html, or similar. For example “tidy” is accompanied by “tidy-license.txt”."
]
}]
{
"comments": {
"lineComment": "#",
},
"brackets": [
["{", "}"],
["[", "]"],
["(", ")"]
],
"autoClosingPairs": [
["{", "}"],
["[", "]"],
["(", ")"],
["\"", "\""],
["'", "'"],
["\"\"\"", "\"\"\""]
],
"surroundingPairs": [
["{", "}"],
["[", "]"],
["(", ")"],
["\"", "\""],
["'", "'"],
["\"\"\"", "\"\"\""]
]
}
\ No newline at end of file
{
"name": "toml",
"displayName": "%displayName%",
"description": "%description%",
"version": "1.0.0",
"publisher": "vscode",
"engines": { "vscode": "*" },
"scripts": {
"update-grammar": "node ../../build/npm/update-grammar.js textmate/toml.tmbundle Syntaxes/TOML.tmLanguage ./syntaxes/toml.tmLanguage.json"
},
"contributes": {
"languages": [{
"id": "toml",
"aliases": ["Toml", "toml"],
"extensions": [".toml"],
"configuration": "./language-configuration.json"
}],
"grammars": [{
"language": "toml",
"scopeName": "source.toml",
"path": "./syntaxes/toml.tmLanguage.json"
}]
}
}
{
"displayName": "TOML Language Basics",
"description": "Provides syntax highlighting and bracket matching in TOML files."
}
\ No newline at end of file
{
"information_for_contributors": [
"This file has been converted from https://github.com/textmate/toml.tmbundle/blob/master/Syntaxes/TOML.tmLanguage",
"If you want to provide a fix or improvement, please create a pull request against the original repository.",
"Once accepted there, we are happy to receive an update request."
],
"version": "https://github.com/textmate/toml.tmbundle/commit/37c532ae892d2af2da76e05918af673efc1111a6",
"name": "TOML",
"scopeName": "source.toml",
"patterns": [
{
"include": "#comments"
},
{
"include": "#groups"
},
{
"include": "#key_pair"
},
{
"include": "#invalid"
}
],
"repository": {
"comments": {
"begin": "(^[ \\t]+)?(?=#)",
"beginCaptures": {
"1": {
"name": "punctuation.whitespace.comment.leading.toml"
}
},
"end": "(?!\\G)",
"patterns": [
{
"begin": "#",
"beginCaptures": {
"0": {
"name": "punctuation.definition.comment.toml"
}
},
"end": "\\n",
"name": "comment.line.number-sign.toml"
}
]
},
"groups": {
"patterns": [
{
"captures": {
"1": {
"name": "punctuation.definition.section.begin.toml"
},
"2": {
"patterns": [
{
"match": "[^\\s.]+",
"name": "entity.name.section.toml"
}
]
},
"3": {
"name": "punctuation.definition.section.begin.toml"
}
},
"match": "^\\s*(\\[)([^\\[\\]]*)(\\])",
"name": "meta.group.toml"
},
{
"captures": {
"1": {
"name": "punctuation.definition.section.begin.toml"
},
"2": {
"patterns": [
{
"match": "[^\\s.]+",
"name": "entity.name.section.toml"
}
]
},
"3": {
"name": "punctuation.definition.section.begin.toml"
}
},
"match": "^\\s*(\\[\\[)([^\\[\\]]*)(\\]\\])",
"name": "meta.group.double.toml"
}
]
},
"invalid": {
"match": "\\S+(\\s*(?=\\S))?",
"name": "invalid.illegal.not-allowed-here.toml"
},
"key_pair": {
"patterns": [
{
"begin": "([A-Za-z0-9_-]+)\\s*(=)\\s*",
"captures": {
"1": {
"name": "variable.other.key.toml"
},
"2": {
"name": "punctuation.separator.key-value.toml"
}
},
"end": "(?<=\\S)(?<!=)|$",
"patterns": [
{
"include": "#primatives"
}
]
},
{
"begin": "((\")(.*)(\"))\\s*(=)\\s*",
"captures": {
"1": {
"name": "variable.other.key.toml"
},
"2": {
"name": "punctuation.definition.variable.begin.toml"
},
"3": {
"patterns": [
{
"match": "\\\\([btnfr\"\\\\]|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})",
"name": "constant.character.escape.toml"
},
{
"match": "\\\\[^btnfr\"\\\\]",
"name": "invalid.illegal.escape.toml"
},
{
"match": "\"",
"name": "invalid.illegal.not-allowed-here.toml"
}
]
},
"4": {
"name": "punctuation.definition.variable.end.toml"
},
"5": {
"name": "punctuation.separator.key-value.toml"
}
},
"end": "(?<=\\S)(?<!=)|$",
"patterns": [
{
"include": "#primatives"
}
]
},
{
"begin": "((')([^']*)('))\\s*(=)\\s*",
"captures": {
"1": {
"name": "variable.other.key.toml"
},
"2": {
"name": "punctuation.definition.variable.begin.toml"
},
"4": {
"name": "punctuation.definition.variable.end.toml"
},
"5": {
"name": "punctuation.separator.key-value.toml"
}
},
"end": "(?<=\\S)(?<!=)|$",
"patterns": [
{
"include": "#primatives"
}
]
}
]
},
"primatives": {
"patterns": [
{
"begin": "\\G\"\"\"",
"beginCaptures": {
"0": {
"name": "punctuation.definition.string.begin.toml"
}
},
"end": "\"\"\"",
"endCaptures": {
"0": {
"name": "punctuation.definition.string.end.toml"
}
},
"name": "string.quoted.triple.double.toml",
"patterns": [
{
"match": "\\\\([btnfr\"\\\\]|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})",
"name": "constant.character.escape.toml"
},
{
"match": "\\\\[^btnfr\"\\\\\\n]",
"name": "invalid.illegal.escape.toml"
}
]
},
{
"begin": "\\G\"",
"beginCaptures": {
"0": {
"name": "punctuation.definition.string.begin.toml"
}
},
"end": "\"",
"endCaptures": {
"0": {
"name": "punctuation.definition.string.end.toml"
}
},
"name": "string.quoted.double.toml",
"patterns": [
{
"match": "\\\\([btnfr\"\\\\]|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})",
"name": "constant.character.escape.toml"
},
{
"match": "\\\\[^btnfr\"\\\\]",
"name": "invalid.illegal.escape.toml"
}
]
},
{
"begin": "\\G'''",
"beginCaptures": {
"0": {
"name": "punctuation.definition.string.begin.toml"
}
},
"end": "'''",
"endCaptures": {
"0": {
"name": "punctuation.definition.string.end.toml"
}
},
"name": "string.quoted.triple.single.toml"
},
{
"begin": "\\G'",
"beginCaptures": {
"0": {
"name": "punctuation.definition.string.begin.toml"
}
},
"end": "'",
"endCaptures": {
"0": {
"name": "punctuation.definition.string.end.toml"
}
},
"name": "string.quoted.single.toml"
},
{
"match": "\\G(?x)\n\t\t\t\t\t\t[0-9]{4}\n\t\t\t\t\t\t-\n\t\t\t\t\t\t(0[1-9]|1[012])\n\t\t\t\t\t\t-\n\t\t\t\t\t\t(?!00|3[2-9])[0-3][0-9]\n\t\t\t\t\t\t(\n\t\t\t\t\t\t\t[Tt]\n\t\t\t\t\t\t\t(?!2[5-9])[0-2][0-9]\n\t\t\t\t\t\t\t:\n\t\t\t\t\t\t\t[0-5][0-9]\n\t\t\t\t\t\t\t:\n\t\t\t\t\t\t\t(?!6[1-9])[0-6][0-9]\n\t\t\t\t\t\t\t(\\.[0-9]+)?\n\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\tZ\n\t\t\t\t\t\t\t | [+-](?!2[5-9])[0-2][0-9]:[0-5][0-9]\n\t\t\t\t\t\t\t)?\n\t\t\t\t\t\t)?\n\t\t\t\t\t",
"name": "constant.other.date.toml"
},
{
"match": "\\G(true|false)",
"name": "constant.language.boolean.toml"
},
{
"match": "\\G([+-]?(0|([1-9](([0-9]|_[0-9])+)?)))(\\.([0-9](([0-9]|_[0-9])+)?))?([eE]([+-]?(0|([1-9](([0-9]|_[0-9])+)?))))?",
"name": "constant.numeric.toml"
},
{
"begin": "\\G\\[",
"beginCaptures": {
"0": {
"name": "punctuation.definition.array.begin.toml"
}
},
"end": "\\]",
"endCaptures": {
"0": {
"name": "punctuation.definition.array.end.toml"
}
},
"name": "meta.array.toml",
"patterns": [
{
"begin": "(?=[\"'']|[+-]?[0-9]|true|false|\\[|\\{)",
"end": ",|(?=])",
"endCaptures": {
"0": {
"name": "punctuation.separator.array.toml"
}
},
"patterns": [
{
"include": "#primatives"
},
{
"include": "#comments"
},
{
"include": "#invalid"
}
]
},
{
"include": "#comments"
},
{
"include": "#invalid"
}
]
},
{
"begin": "\\G\\{",
"beginCaptures": {
"0": {
"name": "punctuation.definition.inline-table.begin.toml"
}
},
"end": "\\}",
"endCaptures": {
"0": {
"name": "punctuation.definition.inline-table.end.toml"
}
},
"name": "meta.inline-table.toml",
"patterns": [
{
"begin": "(?=\\S)",
"end": ",|(?=})",
"endCaptures": {
"0": {
"name": "punctuation.separator.inline-table.toml"
}
},
"patterns": [
{
"include": "#key_pair"
}
]
},
{
"include": "#comments"
}
]
}
]
}
}
}
\ No newline at end of file
# Comment
title = "TOML Example"
[owner]
name = "Tom Preston-Werner"
dob = 1979-05-27T07:32:00-08:00 # First class dates
[
{
"c": "#",
"t": "source.toml comment.line.number-sign.toml punctuation.definition.comment.toml",
"r": {
"dark_plus": "comment: #6A9955",
"light_plus": "comment: #008000",
"dark_vs": "comment: #6A9955",
"light_vs": "comment: #008000",
"hc_black": "comment: #7CA668"
}
},
{
"c": " Comment",
"t": "source.toml comment.line.number-sign.toml",
"r": {
"dark_plus": "comment: #6A9955",
"light_plus": "comment: #008000",
"dark_vs": "comment: #6A9955",
"light_vs": "comment: #008000",
"hc_black": "comment: #7CA668"
}
},
{
"c": "title",
"t": "source.toml variable.other.key.toml",
"r": {
"dark_plus": "variable: #9CDCFE",
"light_plus": "variable: #001080",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "variable: #9CDCFE"
}
},
{
"c": " ",
"t": "source.toml",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "default: #FFFFFF"
}
},
{
"c": "=",
"t": "source.toml punctuation.separator.key-value.toml",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "default: #FFFFFF"
}
},
{
"c": " ",
"t": "source.toml",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "default: #FFFFFF"
}
},
{
"c": "\"",
"t": "source.toml string.quoted.double.toml punctuation.definition.string.begin.toml",
"r": {
"dark_plus": "string: #CE9178",
"light_plus": "string: #A31515",
"dark_vs": "string: #CE9178",
"light_vs": "string: #A31515",
"hc_black": "string: #CE9178"
}
},
{
"c": "TOML Example",
"t": "source.toml string.quoted.double.toml",
"r": {
"dark_plus": "string: #CE9178",
"light_plus": "string: #A31515",
"dark_vs": "string: #CE9178",
"light_vs": "string: #A31515",
"hc_black": "string: #CE9178"
}
},
{
"c": "\"",
"t": "source.toml string.quoted.double.toml punctuation.definition.string.end.toml",
"r": {
"dark_plus": "string: #CE9178",
"light_plus": "string: #A31515",
"dark_vs": "string: #CE9178",
"light_vs": "string: #A31515",
"hc_black": "string: #CE9178"
}
},
{
"c": "[",
"t": "source.toml meta.group.toml punctuation.definition.section.begin.toml",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "default: #FFFFFF"
}
},
{
"c": "owner",
"t": "source.toml meta.group.toml entity.name.section.toml",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "default: #FFFFFF"
}
},
{
"c": "]",
"t": "source.toml meta.group.toml punctuation.definition.section.begin.toml",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "default: #FFFFFF"
}
},
{
"c": "name",
"t": "source.toml variable.other.key.toml",
"r": {
"dark_plus": "variable: #9CDCFE",
"light_plus": "variable: #001080",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "variable: #9CDCFE"
}
},
{
"c": " ",
"t": "source.toml",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "default: #FFFFFF"
}
},
{
"c": "=",
"t": "source.toml punctuation.separator.key-value.toml",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "default: #FFFFFF"
}
},
{
"c": " ",
"t": "source.toml",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "default: #FFFFFF"
}
},
{
"c": "\"",
"t": "source.toml string.quoted.double.toml punctuation.definition.string.begin.toml",
"r": {
"dark_plus": "string: #CE9178",
"light_plus": "string: #A31515",
"dark_vs": "string: #CE9178",
"light_vs": "string: #A31515",
"hc_black": "string: #CE9178"
}
},
{
"c": "Tom Preston-Werner",
"t": "source.toml string.quoted.double.toml",
"r": {
"dark_plus": "string: #CE9178",
"light_plus": "string: #A31515",
"dark_vs": "string: #CE9178",
"light_vs": "string: #A31515",
"hc_black": "string: #CE9178"
}
},
{
"c": "\"",
"t": "source.toml string.quoted.double.toml punctuation.definition.string.end.toml",
"r": {
"dark_plus": "string: #CE9178",
"light_plus": "string: #A31515",
"dark_vs": "string: #CE9178",
"light_vs": "string: #A31515",
"hc_black": "string: #CE9178"
}
},
{
"c": "dob",
"t": "source.toml variable.other.key.toml",
"r": {
"dark_plus": "variable: #9CDCFE",
"light_plus": "variable: #001080",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "variable: #9CDCFE"
}
},
{
"c": " ",
"t": "source.toml",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "default: #FFFFFF"
}
},
{
"c": "=",
"t": "source.toml punctuation.separator.key-value.toml",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "default: #FFFFFF"
}
},
{
"c": " ",
"t": "source.toml",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "default: #FFFFFF"
}
},
{
"c": "1979-05-27T07:32:00-08:00",
"t": "source.toml constant.other.date.toml",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "default: #FFFFFF"
}
},
{
"c": " ",
"t": "source.toml",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "default: #FFFFFF"
}
},
{
"c": "#",
"t": "source.toml comment.line.number-sign.toml punctuation.definition.comment.toml",
"r": {
"dark_plus": "comment: #6A9955",
"light_plus": "comment: #008000",
"dark_vs": "comment: #6A9955",
"light_vs": "comment: #008000",
"hc_black": "comment: #7CA668"
}
},
{
"c": " First class dates",
"t": "source.toml comment.line.number-sign.toml",
"r": {
"dark_plus": "comment: #6A9955",
"light_plus": "comment: #008000",
"dark_vs": "comment: #6A9955",
"light_vs": "comment: #008000",
"hc_black": "comment: #7CA668"
}
}
]
\ No newline at end of file
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册