Skip to content

Commit 09fe3fc

Browse files
authored
Adopt new Ruby grammar (microsoft#235732)
1 parent d9cf59b commit 09fe3fc

File tree

16 files changed

+3298
-2348
lines changed

16 files changed

+3298
-2348
lines changed

extensions/ruby/cgmanifest.json

Lines changed: 43 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,56 @@
44
"component": {
55
"type": "git",
66
"git": {
7-
"name": "textmate/ruby.tmbundle",
8-
"repositoryUrl": "https://github.com/textmate/ruby.tmbundle",
9-
"commitHash": "efcb8941c701343f1b2e9fb105c678152fea6892"
7+
"name": "Shopify/ruby-lsp",
8+
"repositoryUrl": "https://github.com/Shopify/ruby-lsp",
9+
"commitHash": "01a8ecf608b7d8607adcd89c32db72ae3852f33b"
1010
}
1111
},
1212
"licenseDetail": [
13-
"Copyright (c) textmate-ruby.tmbundle project authors",
13+
"The MIT License (MIT)",
1414
"",
15-
"If not otherwise specified (see below), files in this folder fall under the following license: ",
15+
"Copyright (c) 2022-present, Shopify Inc.",
1616
"",
17-
"Permission to copy, use, modify, sell and distribute this",
18-
"software is granted. This software is provided \"as is\" without",
19-
"express or implied warranty, and with no claim as to its",
20-
"suitability for any purpose.",
17+
"Permission is hereby granted, free of charge, to any person obtaining a copy",
18+
"of this software and associated documentation files (the \"Software\"), to deal",
19+
"in the Software without restriction, including without limitation the rights",
20+
"to use, copy, modify, merge, publish, distribute, sublicense, and/or sell",
21+
"copies of the Software, and to permit persons to whom the Software is",
22+
"furnished to do so, subject to the following conditions:",
2123
"",
22-
"An exception is made for files in readable text which contain their own license information, ",
23-
"or files where an accompanying file exists (in the same directory) with a \"-license\" suffix added ",
24-
"to the base-name name of the original file, and an extension of txt, html, or similar. For example ",
25-
"\"tidy\" is accompanied by \"tidy-license.txt\"."
24+
"The above copyright notice and this permission notice shall be included in",
25+
"all copies or substantial portions of the Software.",
26+
"",
27+
"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
28+
"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,",
29+
"FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE",
30+
"AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER",
31+
"LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,",
32+
"OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN",
33+
"THE SOFTWARE.",
34+
"",
35+
"================================================================================",
36+
"The following files and related configuration in package.json are based on a",
37+
"sequence of adaptions: grammars/ruby.cson.json, grammars/erb.cson.json,",
38+
"languages/erb.json.",
39+
"",
40+
"Copyright (c) 2016 Peng Lv",
41+
"Copyright (c) 2017-2019 Stafford Brunk",
42+
"https://github.com/rubyide/vscode-ruby",
43+
"",
44+
" Released under the MIT license",
45+
" https://github.com/rubyide/vscode-ruby/blob/main/LICENSE.txt",
46+
"",
47+
"Copyright (c) 2014 GitHub Inc.",
48+
"https://github.com/atom/language-ruby",
49+
"",
50+
" Released under the MIT license",
51+
" https://github.com/atom/language-ruby/blob/master/LICENSE.md",
52+
"",
53+
"https://github.com/textmate/ruby.tmbundle",
54+
" https://github.com/textmate/ruby.tmbundle#license"
2655
],
27-
"license": "TextMate Bundle License",
56+
"license": "MIT License",
2857
"version": "0.0.0"
2958
}
3059
],

extensions/ruby/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"vscode": "*"
1010
},
1111
"scripts": {
12-
"update-grammar": "node ../node_modules/vscode-grammar-updater/bin textmate/ruby.tmbundle Syntaxes/Ruby.plist ./syntaxes/ruby.tmLanguage.json"
12+
"update-grammar": "node ../node_modules/vscode-grammar-updater/bin Shopify/ruby-lsp vscode/grammars/ruby.cson.json ./syntaxes/ruby.tmLanguage.json"
1313
},
1414
"categories": ["Programming Languages"],
1515
"contributes": {

0 commit comments

Comments
 (0)