github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-04-28 03:01:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

⬆️ tree-sitter, language-ruby

Browse Source
This commit is contained in:
Max Brunsfeld
2018-09-12 11:26:45 -07:00
parent e865182393
commit 04d29d9ba1
3 changed files with 23 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
package-lock.json generated
View File

@@ -3230,10 +3230,10 @@
}
},
"language-ruby": {
"version": "https://www.atom.io/api/packages/language-ruby/versions/0.72.7/tarball",
"integrity": "sha512-k9wv7C/IVYoAP4EZ7DOQ4bGGu5pwaimCjSm6S1OqJZVz/R211f9W40VyfYyzpJ1n3LXPoEAIEDi1UVYcoSYIMw==",
"version": "https://www.atom.io/api/packages/language-ruby/versions/0.72.8/tarball",
"integrity": "sha512-KBDThKNXbf766mJc9Gpq81IYqK4V3EEz6q2GO6TkwNwD/gICHXQ0qo3t5AzM8Fs17VdH97LhoSSOxX2cGGKhVQ==",
"requires": {
"tree-sitter-ruby": "^0.13.6"
"tree-sitter-ruby": "^0.13.9"
}
},
"language-ruby-on-rails": {
@@ -5497,9 +5497,9 @@
"integrity": "sha1-WEZ4Yje0I5AU8F2xVrZDIS1MbzY="
},
"tree-sitter": {
"version": "0.13.9",
"resolved": "https://registry.npmjs.org/tree-sitter/-/tree-sitter-0.13.9.tgz",
"integrity": "sha512-We9UlKA2f374V8JNumCVd0Nc9JrsgxyD1Llcat+eRsalNRWRxLFPOepkR3Q7snz3AXB0BEN+X+nW9vZdLNbQqQ==",
"version": "0.13.10",
"resolved": "https://registry.npmjs.org/tree-sitter/-/tree-sitter-0.13.10.tgz",
"integrity": "sha512-4VlkJ3OymHLUQbm+gz3+A4BZVwuRyWAbKEl8Qiy6r/tnB3caPgqUlkPv4bbui9mr2KufqpmWwks2/IIz6oKh4g==",
"requires": {
"nan": "^2.10.0",
"prebuild-install": "^5.0.0"
@@ -5637,9 +5637,9 @@
}
},
"tree-sitter-ruby": {
"version": "0.13.8",
"resolved": "https://registry.npmjs.org/tree-sitter-ruby/-/tree-sitter-ruby-0.13.8.tgz",
"integrity": "sha512-yNww+yq72eDAZsgSx9tb3G0pPWb8zcY7LjeATfKxOLw5tls7eXIWfVfCkv9bO1OBNqE0m/abTz3oZfM0iIrHUQ==",
"version": "0.13.9",
"resolved": "https://registry.npmjs.org/tree-sitter-ruby/-/tree-sitter-ruby-0.13.9.tgz",
"integrity": "sha512-LdIWR1gtcFpzPerbzxFwsAWpEUFjnQq8ZH/ery2sL4GWkeCDFCoz3IMKEFWfyA01oeMb9RZEMwQ8lwocGHvCpg==",
"requires": {
"nan": "^2.10.0",
"prebuild-install": "^5.0.0"
@@ -5647,7 +5647,7 @@
"dependencies": {
"minimist": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
"resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
},
"prebuild-install": {

6
package.json
View File

@@ -100,7 +100,7 @@
"language-php": "https://www.atom.io/api/packages/language-php/versions/0.44.0/tarball",
"language-property-list": "https://www.atom.io/api/packages/language-property-list/versions/0.9.1/tarball",
"language-python": "https://www.atom.io/api/packages/language-python/versions/0.51.5/tarball",
"language-ruby": "https://www.atom.io/api/packages/language-ruby/versions/0.72.7/tarball",
"language-ruby": "https://www.atom.io/api/packages/language-ruby/versions/0.72.8/tarball",
"language-ruby-on-rails": "https://www.atom.io/api/packages/language-ruby-on-rails/versions/0.25.3/tarball",
"language-sass": "https://www.atom.io/api/packages/language-sass/versions/0.62.0/tarball",
"language-shellscript": "https://www.atom.io/api/packages/language-shellscript/versions/0.27.5/tarball",
@@ -159,7 +159,7 @@
"temp": "^0.8.3",
"text-buffer": "13.14.8",
"timecop": "https://www.atom.io/api/packages/timecop/versions/0.36.2/tarball",
"tree-sitter": "0.13.9",
"tree-sitter": "0.13.10",
"tree-view": "https://www.atom.io/api/packages/tree-view/versions/0.224.2/tarball",
"typescript-simple": "1.0.0",
"underscore-plus": "^1.6.8",
@@ -251,7 +251,7 @@
"language-php": "0.44.0",
"language-property-list": "0.9.1",
"language-python": "0.51.5",
"language-ruby": "0.72.7",
"language-ruby": "0.72.8",
"language-ruby-on-rails": "0.25.3",
"language-sass": "0.62.0",
"language-shellscript": "0.27.5",

36
spec/tree-sitter-language-mode-spec.js
View File

@@ -1146,6 +1146,8 @@ describe('TreeSitterLanguageMode', () => {
const grammar = new TreeSitterGrammar(atom.grammars, rubyGrammarPath, {
parser: 'tree-sitter-ruby',
folds: [
// Note that this isn't how folds actually work in language-ruby. It's
// just to demonstrate the targeting of named vs anonymous nodes.
{
type: 'elsif',
start: {index: 1},
@@ -1173,10 +1175,8 @@ describe('TreeSitterLanguageMode', () => {
b
elsif c
d
elsif e
f
else
g
e
end
`)
@@ -1184,14 +1184,12 @@ describe('TreeSitterLanguageMode', () => {
buffer.setLanguageMode(languageMode)
expect(languageMode.tree.rootNode.toString()).toBe(
"(program (if (identifier) " +
"(identifier) " +
"(elsif (identifier) " +
"(identifier) " +
"(elsif (identifier) " +
"(identifier) " +
"(else " +
"(identifier))))))"
"(program (if (identifier) (then " +
"(identifier)) " +
"(elsif (identifier) (then " +
"(identifier)) " +
"(else " +
"(identifier)))))"
)
editor.foldBufferRow(2)
@@ -1199,10 +1197,8 @@ describe('TreeSitterLanguageMode', () => {
if a
b
elsif c…
elsif e
f
else
g
e
end
`)
@@ -1211,18 +1207,6 @@ describe('TreeSitterLanguageMode', () => {
if a
b
elsif c…
elsif e…
else
g
end
`)
editor.foldBufferRow(6)
expect(getDisplayText(editor)).toBe(dedent `
if a
b
elsif c…
elsif e…
else…
end
`)