💄 Normalize the names of related subscription things

src/display-buffer.coffee

@@ -54,27 +54,26 @@ class DisplayBuffer extends Model
     @decorationsByMarkerId = {}
     @updateAllScreenLines()
     @createFoldForMarker(marker) for marker in @buffer.findMarkers(@getFoldMarkerAttributes())
+    @subscribe @tokenizedBuffer.observeGrammar @subscribeToScopedConfigSettings
     @subscribe @tokenizedBuffer.onDidChange @handleTokenizedBufferChange
-    @subscribe @tokenizedBuffer.onDidChangeGrammar @subscribeForSoftWrapConfigChanges
     @subscribe @buffer.onDidUpdateMarkers @handleBufferMarkersUpdated
     @subscribe @buffer.onDidCreateMarker @handleBufferMarkerCreated
 
-    @subscribeForSoftWrapConfigChanges()
     @updateAllScreenLines()
 
-  subscribeForSoftWrapConfigChanges: =>
-    @softWrapConfigSubscriptions?.dispose()
-    @softWrapConfigSubscriptions = new CompositeDisposable
+  subscribeToScopedConfigSettings: =>
+    @scopedConfigSubscriptions?.dispose()
+    @scopedConfigSubscriptions = subscriptions = new CompositeDisposable
 
     scopeDescriptor = @getGrammarScopeDescriptor()
 
-    @softWrapConfigSubscriptions.add atom.config.onDidChange scopeDescriptor, 'editor.softWrap', =>
+    subscriptions.add atom.config.onDidChange scopeDescriptor, 'editor.softWrap', =>
       @updateWrappedScreenLines()
 
-    @softWrapConfigSubscriptions.add atom.config.onDidChange scopeDescriptor, 'editor.softWrapAtPreferredLineLength', =>
+    subscriptions.add atom.config.onDidChange scopeDescriptor, 'editor.softWrapAtPreferredLineLength', =>
       @updateWrappedScreenLines() if @isSoftWrapped()
 
-    @softWrapConfigSubscriptions.add atom.config.onDidChange scopeDescriptor, 'editor.preferredLineLength', =>
+    subscriptions.add atom.config.onDidChange scopeDescriptor, 'editor.preferredLineLength', =>
       @updateWrappedScreenLines() if @isSoftWrapped() and atom.config.get(scopeDescriptor, 'editor.softWrapAtPreferredLineLength')
 
   serializeParams: ->

src/text-editor-component.coffee

@@ -413,8 +413,8 @@ TextEditorComponent = React.createClass
   onGrammarChanged: ->
     {editor} = @props
 
-    @scopedPropertySubscriptions?.dispose()
-    @scopedPropertySubscriptions = subscriptions = new CompositeDisposable
+    @scopedConfigSubscriptions?.dispose()
+    @scopedConfigSubscriptions = subscriptions = new CompositeDisposable
 
     scopeDescriptor = editor.getGrammarScopeDescriptor()
 

src/text-editor.coffee

@@ -96,7 +96,6 @@ class TextEditor extends Model
 
     @subscribeToBuffer()
     @subscribeToDisplayBuffer()
-    @subscribeToInvisiblesConfigChanges()
 
     if @getCursors().length is 0 and not suppressCursorCreation
       initialLine = Math.max(parseInt(initialLine) or 0, 0)
@@ -158,14 +157,16 @@ class TextEditor extends Model
     @subscribe @displayBuffer.onDidAddDecoration (decoration) => @emit 'decoration-added', decoration
     @subscribe @displayBuffer.onDidRemoveDecoration (decoration) => @emit 'decoration-removed', decoration
 
-  subscribeToInvisiblesConfigChanges: ->
-    @invisiblesConfigSubscriptions?.dispose()
-    @invisiblesConfigSubscriptions = new CompositeDisposable
+    @subscribeToScopedConfigSettings()
+
+  subscribeToScopedConfigSettings: ->
+    @scopedConfigSubscriptions?.dispose()
+    @scopedConfigSubscriptions = subscriptions = new CompositeDisposable
 
     scopeDescriptor = @getGrammarScopeDescriptor()
 
-    @invisiblesConfigSubscriptions.add atom.config.onDidChange scopeDescriptor, 'editor.showInvisibles', => @updateInvisibles()
-    @invisiblesConfigSubscriptions.add atom.config.onDidChange scopeDescriptor, 'editor.invisibles', => @updateInvisibles()
+    subscriptions.add atom.config.onDidChange scopeDescriptor, 'editor.showInvisibles', => @updateInvisibles()
+    subscriptions.add atom.config.onDidChange scopeDescriptor, 'editor.invisibles', => @updateInvisibles()
 
   getViewClass: ->
     require './text-editor-view'
@@ -2689,7 +2690,7 @@ class TextEditor extends Model
 
   handleGrammarChange: ->
     @updateInvisibles()
-    @subscribeToInvisiblesConfigChanges()
+    @subscribeToScopedConfigSettings()
     @unfoldAll()
     @emit 'grammar-changed'
     @emitter.emit 'did-change-grammar'

src/tokenized-buffer.coffee

@@ -42,6 +42,10 @@ class TokenizedBuffer extends Model
     params.buffer = atom.project.bufferForPathSync(params.bufferPath)
     params
 
+  observeGrammar: (callback) ->
+    callback(@grammar)
+    @onDidChangeGrammar(callback)
+
   onDidChangeGrammar: (callback) ->
     @emitter.on 'did-change-grammar', callback