Revert "Merge pull request #19165 from atom/mb-upgrade-tree-sitter-to-0-14-again"

This reverts commit ce2e2117d8, reversing
changes made to 4ce00667b5.
This commit is contained in:
Max Brunsfeld
2019-04-16 12:54:16 -07:00
parent ce2e2117d8
commit e10adac427
5 changed files with 42 additions and 14 deletions

View File

@@ -12,7 +12,6 @@ FindParentDir = require 'find-parent-dir'
TextEditor = require '../src/text-editor'
TextEditorElement = require '../src/text-editor-element'
TextMateLanguageMode = require '../src/text-mate-language-mode'
TreeSitterLanguageMode = require '../src/tree-sitter-language-mode'
{clipboard} = require 'electron'
jasmineStyle = document.createElement('style')
@@ -102,7 +101,6 @@ beforeEach ->
# make tokenization synchronous
TextMateLanguageMode.prototype.chunkSize = Infinity
TreeSitterLanguageMode.prototype.syncTimeoutMicros = Infinity
spyOn(TextMateLanguageMode.prototype, "tokenizeInBackground").andCallFake -> @tokenizeNextChunk()
# Without this spy, TextEditor.onDidTokenize callbacks would not be called

View File

@@ -414,7 +414,7 @@ describe('TreeSitterLanguageMode', () => {
const languageMode = new TreeSitterLanguageMode({
buffer,
grammar,
syncTimeoutMicros: 0
syncOperationLimit: 0
})
buffer.setLanguageMode(languageMode)
await nextHighlightingUpdate(languageMode)
@@ -797,7 +797,7 @@ describe('TreeSitterLanguageMode', () => {
buffer,
grammar: htmlGrammar,
grammars: atom.grammars,
syncTimeoutMicros: 0
syncOperationLimit: 0
})
buffer.setLanguageMode(languageMode)
@@ -827,7 +827,7 @@ describe('TreeSitterLanguageMode', () => {
)
atom.grammars.loadGrammarSync(jsGrammarPath)
atom.grammars.assignLanguageMode(buffer, 'source.js')
buffer.getLanguageMode().syncTimeoutMicros = 0
buffer.getLanguageMode().syncOperationLimit = 0
const initialSeed = Date.now()
for (let i = 0, trialCount = 10; i < trialCount; i++) {