Skip to content

Commit 5073dfc

Browse files
committed
[yaml] update grammar, add tests, update license
1 parent e3a3c3a commit 5073dfc

10 files changed

Lines changed: 1282 additions & 749 deletions

File tree

extensions/yaml/OSSREADME.json

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,21 @@
88
"licenseDetail": [
99
"Copyright (c) 2015 FichteFoll <fichtefoll2@googlemail.com>",
1010
"",
11-
"If not otherwise specified (see below), files in this repository fall under the following license:",
11+
"Permission is hereby granted, free of charge, to any person obtaining a copy",
12+
"of this software and associated documentation files (the \"Software\"), to deal",
13+
"in the Software without restriction, including without limitation the rights",
14+
"to use, copy, modify, merge, publish, distribute, sublicense, and/or sell",
15+
"copies of the Software, and to permit persons to whom the Software is",
16+
"furnished to do so, subject to the following conditions:",
1217
"",
13-
"Permission to copy, use, modify, sell and distribute this",
14-
"software is granted. This software is provided \"as is\" without",
15-
"express or implied warranty, and with no claim as to its",
16-
"suitability for any purpose.",
18+
"The above copyright notice and this permission notice shall be included in all",
19+
"copies or substantial portions of the Software.",
1720
"",
18-
"An exception is made for files in readable text which contain their own license information,",
19-
"or files where an accompanying file exists (in the same directory) with a \"-license\" suffix added",
20-
"to the base-name name of the original file, and an extension of txt, html, or similar. For example",
21-
"\"tidy\" is accompanied by \"tidy-license.txt\"."
21+
"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
22+
"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,",
23+
"FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE",
24+
"AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER",
25+
"LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,",
26+
"OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
2227
]
2328
}]

extensions/yaml/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"grammars": [{
1818
"language": "yaml",
1919
"scopeName": "source.yaml",
20-
"path": "./syntaxes/YAML.plist"
20+
"path": "./syntaxes/yaml.json"
2121
}]
2222
}
2323
}

0 commit comments

Comments
 (0)