Merge pull request #2431 from atom/cj-add-tokenized-event

Use tokenized event to determine tab style

spec/editor-spec.coffee

@@ -2876,6 +2876,18 @@ describe "Editor", ->
       expect(editor.lineForBufferRow(4)).toBe "    }"
       expect(editor.lineForBufferRow(5)).toBe "    i=1"
 
+  describe "soft and hard tabs", ->
+    it "resets the tab style when tokenization is complete", ->
+      editor.destroy()
+      atom.project.open('sample-with-tabs-and-leading-comment.coffee').then (o) -> editor = o
+      expect(editor.softTabs).toBe true
+
+      waitsForPromise ->
+        atom.packages.activatePackage('language-coffee-script')
+
+      runs ->
+        expect(editor.softTabs).toBe false
+
   describe ".destroy()", ->
     it "destroys all markers associated with the edit session", ->
       expect(buffer.getMarkerCount()).toBeGreaterThan 0

spec/fixtures/sample-with-tabs-and-leading-comment.coffee

@@ -0,0 +1,4 @@
+  # This is a comment
+if this.studyingEconomics
+	buy()	while supply > demand
+		sell() until supply > demand

spec/tokenized-buffer-spec.coffee

@@ -385,7 +385,58 @@ describe "TokenizedBuffer", ->
       expect(tokens[1].value).toBeTruthy()
       expect(tokens[2].value).toBe 'xyz'
 
+  describe "when the grammar is tokenized", ->
+    it "emits the `tokenized` event", ->
+      editor = null
+      tokenizedHandler = jasmine.createSpy("tokenized handler")
+
+      waitsForPromise ->
+        atom.project.open('sample.js').then (o) -> editor = o
+
+      runs ->
+        tokenizedBuffer = editor.displayBuffer.tokenizedBuffer
+        tokenizedBuffer.on 'tokenized', tokenizedHandler
+        fullyTokenize(tokenizedBuffer)
+        expect(tokenizedHandler.callCount).toBe(1)
+
+    it "doesn't re-emit the `tokenized` event when it is re-tokenized", ->
+      editor = null
+      tokenizedHandler = jasmine.createSpy("tokenized handler")
+
+      waitsForPromise ->
+        atom.project.open('sample.js').then (o) -> editor = o
+
+      runs ->
+        tokenizedBuffer = editor.displayBuffer.tokenizedBuffer
+        fullyTokenize(tokenizedBuffer)
+
+        tokenizedBuffer.on 'tokenized', tokenizedHandler
+        editor.getBuffer().insert([0, 0], "'")
+        fullyTokenize(tokenizedBuffer)
+        expect(tokenizedHandler).not.toHaveBeenCalled()
+
   describe "when the grammar is updated because a grammar it includes is activated", ->
+    it "re-emits the `tokenized` event", ->
+      editor = null
+      tokenizedBuffer = null
+      tokenizedHandler = jasmine.createSpy("tokenized handler")
+
+      waitsForPromise ->
+        atom.project.open('coffee.coffee').then (o) -> editor = o
+
+      runs ->
+        tokenizedBuffer = editor.displayBuffer.tokenizedBuffer
+        tokenizedBuffer.on 'tokenized', tokenizedHandler
+        fullyTokenize(tokenizedBuffer)
+        tokenizedHandler.reset()
+
+      waitsForPromise ->
+        atom.packages.activatePackage('language-coffee-script')
+
+      runs ->
+        fullyTokenize(tokenizedBuffer)
+        expect(tokenizedHandler.callCount).toBe(1)
+
     it "retokenizes the buffer", ->
 
       waitsForPromise ->

src/display-buffer.coffee

@@ -46,6 +46,7 @@ class DisplayBuffer extends Model
     @updateAllScreenLines()
     @createFoldForMarker(marker) for marker in @buffer.findMarkers(@getFoldMarkerAttributes())
     @subscribe @tokenizedBuffer, 'grammar-changed', (grammar) => @emit 'grammar-changed', grammar
+    @subscribe @tokenizedBuffer, 'tokenized', => @emit 'tokenized'
     @subscribe @tokenizedBuffer, 'changed', @handleTokenizedBufferChange
     @subscribe @buffer, 'markers-updated', @handleBufferMarkersUpdated
     @subscribe @buffer, 'marker-created', @handleBufferMarkerCreated

src/editor.coffee

@@ -211,6 +211,7 @@ class Editor extends Model
     @subscribe @displayBuffer, "changed", (e) => @emit 'screen-lines-changed', e
     @subscribe @displayBuffer, "markers-updated", => @mergeIntersectingSelections()
     @subscribe @displayBuffer, 'grammar-changed', => @handleGrammarChange()
+    @subscribe @displayBuffer, 'tokenized', => @handleTokenization()
     @subscribe @displayBuffer, 'soft-wrap-changed', (args...) => @emit 'soft-wrap-changed', args...
 
   getViewClass: ->
@@ -1851,6 +1852,9 @@ class Editor extends Model
 
   logScreenLines: (start, end) -> @displayBuffer.logLines(start, end)
 
+  handleTokenization: ->
+    @softTabs = @usesSoftTabs() ? @softTabs
+
   handleGrammarChange: ->
     @unfoldAll()
     @emit 'grammar-changed'

src/tokenized-buffer.coffee

@@ -78,6 +78,7 @@ class TokenizedBuffer extends Model
     @tokenizedLines = @buildPlaceholderTokenizedLinesForRows(0, @buffer.getLastRow())
     @invalidRows = []
     @invalidateRow(0)
+    @fullyTokenized = false
 
   setVisible: (@visible) ->
     @tokenizeInBackground() if @visible
@@ -124,7 +125,11 @@ class TokenizedBuffer extends Model
       @invalidateRow(row + 1) unless filledRegion
       @emit "changed", { start: invalidRow, end: row, delta: 0 }
 
-    @tokenizeInBackground() if @firstInvalidRow()?
+    if @firstInvalidRow()?
+      @tokenizeInBackground()
+    else
+      @emit "tokenized" unless @fullyTokenized
+      @fullyTokenized = true
 
   firstInvalidRow: ->
     @invalidRows[0]