Merge pull request #16290 from atom/mb-rename-tokenized-buffer

Rename TokenizedBuffer to TextMateLanguageMode
atom · Nov 29, 2017 · c318d01 · c318d01
2 parents 31e20d3 + 607ed74
commit c318d01
Show file tree

Hide file tree

Showing 12 changed files with 1,187 additions and 1,194 deletions.
diff --git a/spec/spec-helper.coffee b/spec/spec-helper.coffee
@@ -11,7 +11,7 @@ FindParentDir = require 'find-parent-dir'
 
 TextEditor = require '../src/text-editor'
 TextEditorElement = require '../src/text-editor-element'
-TokenizedBuffer = require '../src/tokenized-buffer'
+TextMateLanguageMode = require '../src/text-mate-language-mode'
 clipboard = require '../src/safe-clipboard'
 
 jasmineStyle = document.createElement('style')
@@ -100,8 +100,8 @@ beforeEach ->
   spyOn(TextEditor.prototype, "shouldPromptToSave").andReturn false
 
   # make tokenization synchronous
-  TokenizedBuffer.prototype.chunkSize = Infinity
-  spyOn(TokenizedBuffer.prototype, "tokenizeInBackground").andCallFake -> @tokenizeNextChunk()
+  TextMateLanguageMode.prototype.chunkSize = Infinity
+  spyOn(TextMateLanguageMode.prototype, "tokenizeInBackground").andCallFake -> @tokenizeNextChunk()
 
   # Without this spy, TextEditor.onDidTokenize callbacks would not be called
   # after the buffer's language mode changed, because by the time the editor

diff --git a/spec/text-editor-registry-spec.js b/spec/text-editor-registry-spec.js
@@ -230,15 +230,15 @@ describe('TextEditorRegistry', function () {
             hello;
           }
         `)
-        editor.tokenizedBuffer.retokenizeLines()
+        editor.getBuffer().getLanguageMode().retokenizeLines()
         expect(editor.getSoftTabs()).toBe(true)
 
         editor.setText(dedent`
           {
           	hello;
           }
         `)
-        editor.tokenizedBuffer.retokenizeLines()
+        editor.getBuffer().getLanguageMode().retokenizeLines()
         expect(editor.getSoftTabs()).toBe(false)
 
         editor.setText(dedent`
@@ -249,7 +249,7 @@ describe('TextEditorRegistry', function () {
           ${'\t'}hello;
           }
         ` + editor.getText())
-        editor.tokenizedBuffer.retokenizeLines()
+        editor.getBuffer().getLanguageMode().retokenizeLines()
         expect(editor.getSoftTabs()).toBe(false)
 
         editor.setText(dedent`
@@ -262,7 +262,7 @@ describe('TextEditorRegistry', function () {
           }
         `)
 
-        editor.tokenizedBuffer.retokenizeLines()
+        editor.getBuffer().getLanguageMode().retokenizeLines()
         expect(editor.getSoftTabs()).toBe(false)
 
         editor.setText(dedent`
@@ -274,7 +274,7 @@ describe('TextEditorRegistry', function () {
             hello;
           }
         `)
-        editor.tokenizedBuffer.retokenizeLines()
+        editor.getBuffer().getLanguageMode().retokenizeLines()
         expect(editor.getSoftTabs()).toBe(true)
       })
     })

diff --git a/spec/text-editor-spec.js b/spec/text-editor-spec.js
@@ -7,7 +7,7 @@ const dedent = require('dedent')
 const clipboard = require('../src/safe-clipboard')
 const TextEditor = require('../src/text-editor')
 const TextBuffer = require('text-buffer')
-const TokenizedBuffer = require('../src/tokenized-buffer')
+const TextMateLanguageMode = require('../src/text-mate-language-mode')
 
 describe('TextEditor', () => {
   let buffer, editor, lineLengths
@@ -5610,7 +5610,7 @@ describe('TextEditor', () => {
     it('notifies onDidTokenize observers when retokenization is finished', async () => {
       // Exercise the full `tokenizeInBackground` code path, which bails out early if
       // `.setVisible` has not been called with `true`.
-      jasmine.unspy(TokenizedBuffer.prototype, 'tokenizeInBackground')
+      jasmine.unspy(TextMateLanguageMode.prototype, 'tokenizeInBackground')
       jasmine.attachToDOM(editor.getElement())
 
       const events = []