Don't use atom globals in TokenizedBuffer

spec/token-iterator-spec.coffee

@@ -25,7 +25,7 @@ describe "TokenIterator", ->
       x
     """)
     tokenizedBuffer = new TokenizedBuffer({
-      buffer, config: atom.config, grammarRegistry: atom.grammars, packageManager: atom.packages
+      buffer, config: atom.config, grammarRegistry: atom.grammars, packageManager: atom.packages, assert: atom.assert
     })
     tokenizedBuffer.setGrammar(grammar)
 

spec/tokenized-buffer-spec.coffee

@@ -28,7 +28,7 @@ describe "TokenizedBuffer", ->
     beforeEach ->
       buffer = atom.project.bufferForPathSync('sample.js')
       tokenizedBuffer = new TokenizedBuffer({
-        buffer, config: atom.config, grammarRegistry: atom.grammars, packageManager: atom.packages
+        buffer, config: atom.config, grammarRegistry: atom.grammars, packageManager: atom.packages, assert: atom.assert
       })
       startTokenizing(tokenizedBuffer)
 
@@ -42,7 +42,7 @@ describe "TokenizedBuffer", ->
     beforeEach ->
       buffer = atom.project.bufferForPathSync('sample.js')
       tokenizedBuffer = new TokenizedBuffer({
-        buffer, config: atom.config, grammarRegistry: atom.grammars, packageManager: atom.packages
+        buffer, config: atom.config, grammarRegistry: atom.grammars, packageManager: atom.packages, assert: atom.assert
       })
       startTokenizing(tokenizedBuffer)
       tokenizedBuffer.onDidChange changeHandler = jasmine.createSpy('changeHandler')
@@ -350,7 +350,7 @@ describe "TokenizedBuffer", ->
       runs ->
         buffer = atom.project.bufferForPathSync('sample-with-tabs.coffee')
         tokenizedBuffer = new TokenizedBuffer({
-          buffer, config: atom.config, grammarRegistry: atom.grammars, packageManager: atom.packages
+          buffer, config: atom.config, grammarRegistry: atom.grammars, packageManager: atom.packages, assert: atom.assert
         })
         startTokenizing(tokenizedBuffer)
 
@@ -457,7 +457,7 @@ describe "TokenizedBuffer", ->
           //\uD835\uDF97xyz
         """
         tokenizedBuffer = new TokenizedBuffer({
-          buffer, config: atom.config, grammarRegistry: atom.grammars, packageManager: atom.packages
+          buffer, config: atom.config, grammarRegistry: atom.grammars, packageManager: atom.packages, assert: atom.assert
         })
         fullyTokenize(tokenizedBuffer)
 
@@ -553,7 +553,7 @@ describe "TokenizedBuffer", ->
         buffer = atom.project.bufferForPathSync()
         buffer.setText "<div class='name'><%= User.find(2).full_name %></div>"
         tokenizedBuffer = new TokenizedBuffer({
-          buffer, config: atom.config, grammarRegistry: atom.grammars, packageManager: atom.packages
+          buffer, config: atom.config, grammarRegistry: atom.grammars, packageManager: atom.packages, assert: atom.assert
         })
         tokenizedBuffer.setGrammar(atom.grammars.selectGrammar('test.erb'))
         fullyTokenize(tokenizedBuffer)
@@ -577,7 +577,7 @@ describe "TokenizedBuffer", ->
     it "returns the correct token (regression)", ->
       buffer = atom.project.bufferForPathSync('sample.js')
       tokenizedBuffer = new TokenizedBuffer({
-        buffer, config: atom.config, grammarRegistry: atom.grammars, packageManager: atom.packages
+        buffer, config: atom.config, grammarRegistry: atom.grammars, packageManager: atom.packages, assert: atom.assert
       })
       fullyTokenize(tokenizedBuffer)
       expect(tokenizedBuffer.tokenForPosition([1, 0]).scopes).toEqual ["source.js"]
@@ -589,7 +589,7 @@ describe "TokenizedBuffer", ->
       buffer = atom.project.bufferForPathSync('sample.js')
       tokenizedBuffer = new TokenizedBuffer({
         buffer, config: atom.config, grammarRegistry: atom.grammars,
-        packageManager: atom.packages
+        packageManager: atom.packages, assert: atom.assert
       })
       fullyTokenize(tokenizedBuffer)
 
@@ -611,7 +611,7 @@ describe "TokenizedBuffer", ->
       buffer = atom.project.bufferForPathSync('sample.js')
       buffer.setText('\ttest')
       tokenizedBuffer = new TokenizedBuffer({
-        buffer, config: atom.config, grammarRegistry: atom.grammars, packageManager: atom.packages
+        buffer, config: atom.config, grammarRegistry: atom.grammars, packageManager: atom.packages, assert: atom.assert
       })
       fullyTokenize(tokenizedBuffer)
       expect(tokenizedBuffer.tokenForPosition([0, 0]).value).toBe '  '
@@ -622,7 +622,7 @@ describe "TokenizedBuffer", ->
       buffer = atom.project.bufferForPathSync('sample.js')
       buffer.setText('\ttest')
       tokenizedBuffer = new TokenizedBuffer({
-        buffer, config: atom.config, grammarRegistry: atom.grammars, packageManager: atom.packages
+        buffer, config: atom.config, grammarRegistry: atom.grammars, packageManager: atom.packages, assert: atom.assert
       })
       fullyTokenize(tokenizedBuffer)
       expect(tokenizedBuffer.tokenForPosition([0, 0]).value).toBe '  '
@@ -637,7 +637,7 @@ describe "TokenizedBuffer", ->
     it "updates the tokens with the appropriate invisible characters", ->
       buffer = new TextBuffer(text: "  \t a line with tabs\tand \tspaces \t ")
       tokenizedBuffer = new TokenizedBuffer({
-        buffer, config: atom.config, grammarRegistry: atom.grammars, packageManager: atom.packages
+        buffer, config: atom.config, grammarRegistry: atom.grammars, packageManager: atom.packages, assert: atom.assert
       })
       fullyTokenize(tokenizedBuffer)
 
@@ -652,7 +652,7 @@ describe "TokenizedBuffer", ->
     it "assigns endOfLineInvisibles to tokenized lines", ->
       buffer = new TextBuffer(text: "a line that ends in a carriage-return-line-feed \r\na line that ends in just a line-feed\na line with no ending")
       tokenizedBuffer = new TokenizedBuffer({
-        buffer, config: atom.config, grammarRegistry: atom.grammars, packageManager: atom.packages
+        buffer, config: atom.config, grammarRegistry: atom.grammars, packageManager: atom.packages, assert: atom.assert
       })
 
       atom.config.set('editor.showInvisibles', true)
@@ -675,7 +675,7 @@ describe "TokenizedBuffer", ->
     beforeEach ->
       buffer = atom.project.bufferForPathSync('sample.js')
       tokenizedBuffer = new TokenizedBuffer({
-        buffer, config: atom.config, grammarRegistry: atom.grammars, packageManager: atom.packages
+        buffer, config: atom.config, grammarRegistry: atom.grammars, packageManager: atom.packages, assert: atom.assert
       })
       fullyTokenize(tokenizedBuffer)
 
@@ -735,7 +735,7 @@ describe "TokenizedBuffer", ->
     beforeEach ->
       buffer = atom.project.bufferForPathSync('sample.js')
       tokenizedBuffer = new TokenizedBuffer({
-        buffer, config: atom.config, grammarRegistry: atom.grammars, packageManager: atom.packages
+        buffer, config: atom.config, grammarRegistry: atom.grammars, packageManager: atom.packages, assert: atom.assert
       })
       fullyTokenize(tokenizedBuffer)
 
@@ -832,7 +832,7 @@ describe "TokenizedBuffer", ->
       buffer.insert [10, 0], "  // multi-line\n  // comment\n  // block\n"
       buffer.insert [0, 0], "// multi-line\n// comment\n// block\n"
       tokenizedBuffer = new TokenizedBuffer({
-        buffer, config: atom.config, grammarRegistry: atom.grammars, packageManager: atom.packages
+        buffer, config: atom.config, grammarRegistry: atom.grammars, packageManager: atom.packages, assert: atom.assert
       })
       fullyTokenize(tokenizedBuffer)
       tokenizedBuffer.onDidChange (change) ->
@@ -911,7 +911,7 @@ describe "TokenizedBuffer", ->
       buffer.setText('a\nb\nc')
 
       tokenizedBuffer = new TokenizedBuffer({
-        buffer, config: atom.config, grammarRegistry: atom.grammars, packageManager: atom.packages
+        buffer, config: atom.config, grammarRegistry: atom.grammars, packageManager: atom.packages, assert: atom.assert
       })
       tokenizeCallback = jasmine.createSpy('onDidTokenize')
       tokenizedBuffer.onDidTokenize(tokenizeCallback)

src/display-buffer.coffee

@@ -48,7 +48,7 @@ class DisplayBuffer extends Model
 
     @tokenizedBuffer ?= new TokenizedBuffer({
       tabLength, buffer, ignoreInvisibles, @largeFileMode, @config,
-      @grammarRegistry, @packageManager
+      @grammarRegistry, @packageManager, @assert
     })
     @buffer = @tokenizedBuffer.buffer
     @charWidthsByScope = {}

src/tokenized-buffer.coffee

@@ -22,16 +22,17 @@ class TokenizedBuffer extends Model
   changeCount: 0
 
   @deserialize: (state, atomEnvironment) ->
-    state.buffer = atom.project.bufferForPathSync(state.bufferPath)
+    state.buffer = atomEnvironment.project.bufferForPathSync(state.bufferPath)
     state.config = atomEnvironment.config
     state.grammarRegistry = atomEnvironment.grammars
     state.packageManager = atomEnvironment.packages
+    state.assert = atomEnvironment.assert
     new this(state)
 
   constructor: (params) ->
     {
       @buffer, @tabLength, @ignoreInvisibles, @largeFileMode, @config,
-      @grammarRegistry, @packageManager
+      @grammarRegistry, @packageManager, @assert
     } = params
 
     @emitter = new Emitter
@@ -299,7 +300,7 @@ class TokenizedBuffer extends Model
     # undefined. This should paper over the problem but we want to figure out
     # what is happening:
     tokenizedLine = @tokenizedLineForRow(row)
-    atom.assert tokenizedLine?, "TokenizedLine is undefined", (error) =>
+    @assert tokenizedLine?, "TokenizedLine is undefined", (error) =>
       error.metadata = {
         row: row
         rowCount: @tokenizedLines.length
@@ -399,7 +400,7 @@ class TokenizedBuffer extends Model
         loop
           break if scopes.pop() is matchingStartTag
           if scopes.length is 0
-            atom.assert false, "Encountered an unmatched scope end tag.", (error) =>
+            @assert false, "Encountered an unmatched scope end tag.", (error) =>
               error.metadata = {
                 grammarScopeName: @grammar.scopeName
                 unmatchedEndTag: @grammar.scopeForId(tag)