Skip to content
This repository has been archived by the owner on Mar 3, 2023. It is now read-only.

Turn tree-sitter on by default #17879

Merged
merged 11 commits into from
Sep 5, 2018
Merged

Turn tree-sitter on by default #17879

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
979c52a
Enable Tree-sitter by default
maxbrunsfeld Aug 24, 2018
d88ae67
Update fixture package to use a tree-sitter grammar
maxbrunsfeld Aug 24, 2018
e4248d1
Disable useTreeSitterParsers in the TextMateLanguageMode specs.
Aug 20, 2018
0db70b7
Fix up text editor specs
maxbrunsfeld Aug 22, 2018
60c19af
Move more textmate-specific tests to TextMateLanguageMode spec
maxbrunsfeld Aug 22, 2018
d8c2f0c
:arrow_up: bracket-matcher, markdown-preview
maxbrunsfeld Sep 4, 2018
ba96bbf
Add TreeSitterLanguageMode.tokenForPosition
maxbrunsfeld Sep 5, 2018
5d9c9ed
:arrow_up: link
maxbrunsfeld Sep 5, 2018
b3dd87d
:arrow_up: language packages
maxbrunsfeld Sep 5, 2018
f6f1cb5
Merge branch 'master' into ak-mb-tree-sitter-on-by-default
Sep 5, 2018
d9e72a2
:arrow_up: autocomplete-html
maxbrunsfeld Sep 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add TreeSitterLanguageMode.tokenForPosition
  • Loading branch information
@maxbrunsfeld
maxbrunsfeld committed Sep 5, 2018
commit ba96bbf8f193014f060eeabe4253f552a696f1b3
8 changes: 8 additions & 0 deletions spec/tree-sitter-language-mode-spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1360,6 +1360,14 @@ describe('TreeSitterLanguageMode', () => {
'source.js',
'property.name'
])

// Drive-by test for .tokenForPosition()
const token = editor.tokenForBufferPosition([0, 'foo({b'.length])
expect(token.value).toBe('bar')
expect(token.scopes).toEqual([
'source.js',
'property.name'
])
})

it('includes nodes in injected syntax trees', async () => {
Expand Down
7 changes: 7 additions & 0 deletions src/tree-sitter-language-mode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ const {Point, Range, spliceArray} = require('text-buffer')
const {Patch} = require('superstring')
const {Emitter} = require('event-kit')
const ScopeDescriptor = require('./scope-descriptor')
const Token = require('./token')
const TokenizedLine = require('./tokenized-line')
const TextMateLanguageMode = require('./text-mate-language-mode')
const {matcherForSelector} = require('./selectors')
Expand Down Expand Up @@ -435,6 +436,12 @@ class TreeSitterLanguageMode {
return new ScopeDescriptor({scopes})
}

tokenForPosition (point) {
const node = this.getSyntaxNodeAtPosition(point)
const scopes = this.scopeDescriptorForPosition(point).getScopesArray()
return new Token({value: node.text, scopes})
}

getGrammar () {
return this.grammar
}
Expand Down