From decaa3dfcf4fcce9262c5deb3eef5ea8d4140aff Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 26 Aug 2013 19:09:42 -0700 Subject: [PATCH] :lipstick: Move extend calls to top of class --- src/config.coffee | 4 ++-- src/cursor.coffee | 4 ++-- src/directory.coffee | 4 ++-- src/display-buffer-marker.coffee | 6 +++--- src/edit-session.coffee | 6 +++--- src/file.coffee | 4 ++-- src/language-mode.coffee | 6 +++--- src/null-grammar.coffee | 4 ++-- src/project.coffee | 4 ++-- src/selection.coffee | 4 ++-- src/syntax.coffee | 4 ++-- src/task.coffee | 4 ++-- src/text-buffer.coffee | 4 ++-- src/tokenized-buffer.coffee | 6 +++--- src/window-event-handler.coffee | 4 ++-- 15 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/config.coffee b/src/config.coffee index 23e9c24b3..76aa7d8e2 100644 --- a/src/config.coffee +++ b/src/config.coffee @@ -23,6 +23,8 @@ userStoragePath = path.join(configDirPath, "storage") # user's configuration file. module.exports = class Config + _.extend @prototype, EventEmitter + configDirPath: configDirPath themeDirPaths: [userThemesDirPath, bundledThemesDirPath] bundledPackageDirPaths: [nodeModulesDirPath] @@ -210,5 +212,3 @@ class Config save: -> CSON.writeFileSync(@configFilePath, @settings) - -_.extend Config.prototype, EventEmitter diff --git a/src/cursor.coffee b/src/cursor.coffee index 0bcd3b271..51b5760ee 100644 --- a/src/cursor.coffee +++ b/src/cursor.coffee @@ -7,6 +7,8 @@ _ = require 'underscore' # Cursors have some metadata attached in the form of a {BufferMarker}. module.exports = class Cursor + _.extend @prototype, EventEmitter + screenPosition: null bufferPosition: null goalColumn: null @@ -441,5 +443,3 @@ class Cursor # Returns an {Array} of {String}s. getScopes: -> @editSession.scopesForBufferPosition(@getBufferPosition()) - -_.extend Cursor.prototype, EventEmitter diff --git a/src/directory.coffee b/src/directory.coffee index e4bc243a6..b53db4ba5 100644 --- a/src/directory.coffee +++ b/src/directory.coffee @@ -11,6 +11,8 @@ EventEmitter = require 'event-emitter' # Directories contain an array of {File}s. module.exports = class Directory + _.extend @prototype, EventEmitter + path: null realPath: null @@ -116,5 +118,3 @@ class Directory if @watchSubscription? @watchSubscription.close() @watchSubscription = null - -_.extend Directory.prototype, EventEmitter diff --git a/src/display-buffer-marker.coffee b/src/display-buffer-marker.coffee index c670ab55b..1621c7fca 100644 --- a/src/display-buffer-marker.coffee +++ b/src/display-buffer-marker.coffee @@ -5,6 +5,9 @@ Subscriber = require 'subscriber' module.exports = class DisplayBufferMarker + _.extend @prototype, EventEmitter + _.extend @prototype, Subscriber + bufferMarkerSubscription: null oldHeadBufferPosition: null oldHeadScreenPosition: null @@ -213,6 +216,3 @@ class DisplayBufferMarker @oldTailBufferPosition = newTailBufferPosition @oldTailScreenPosition = newTailScreenPosition @wasValid = isValid - -_.extend DisplayBufferMarker.prototype, EventEmitter -_.extend DisplayBufferMarker.prototype, Subscriber diff --git a/src/edit-session.coffee b/src/edit-session.coffee index 70ccbf73a..cc5413f69 100644 --- a/src/edit-session.coffee +++ b/src/edit-session.coffee @@ -16,6 +16,9 @@ TextMateScopeSelector = require('first-mate').ScopeSelector # An `EditSession` manages the states between {Editor}s, {Buffer}s, and the project as a whole. module.exports = class EditSession + _.extend @prototype, EventEmitter + _.extend @prototype, Subscriber + @acceptsDocuments: true registerDeserializer(this) @@ -1396,6 +1399,3 @@ class EditSession @displayBuffer.getDebugSnapshot() @displayBuffer.tokenizedBuffer.getDebugSnapshot() ].join('\n\n') - -_.extend(EditSession.prototype, EventEmitter) -_.extend(EditSession.prototype, Subscriber) diff --git a/src/file.coffee b/src/file.coffee index ecb3afbf4..59d1263c8 100644 --- a/src/file.coffee +++ b/src/file.coffee @@ -12,6 +12,8 @@ _ = require 'underscore' # * {Directory}, which associcates the children of a directory as files module.exports = class File + _.extend @prototype, EventEmitter + path: null cachedContents: null @@ -108,5 +110,3 @@ class File if @watchSubscription @watchSubscription.close() @watchSubscription = null - -_.extend File.prototype, EventEmitter diff --git a/src/language-mode.coffee b/src/language-mode.coffee index 1f13d4626..cee5b409c 100644 --- a/src/language-mode.coffee +++ b/src/language-mode.coffee @@ -9,6 +9,9 @@ Subscriber = require 'subscriber' module.exports = class LanguageMode + _.extend @prototype, EventEmitter + _.extend @prototype, Subscriber + buffer: null grammar: null editSession: null @@ -296,6 +299,3 @@ class LanguageMode foldEndRegexForScopes: (scopes) -> if foldEndPattern = syntax.getProperty(scopes, 'editor.foldEndPattern') new OnigRegExp(foldEndPattern) - -_.extend LanguageMode.prototype, EventEmitter -_.extend LanguageMode.prototype, Subscriber diff --git a/src/null-grammar.coffee b/src/null-grammar.coffee index eb6a38eea..6f8d62def 100644 --- a/src/null-grammar.coffee +++ b/src/null-grammar.coffee @@ -5,6 +5,8 @@ _ = require 'underscore' ### Internal ### module.exports = class NullGrammar + _.extend @prototype, EventEmitter + name: 'Null Grammar' scopeName: 'text.plain.null-grammar' @@ -20,5 +22,3 @@ class NullGrammar tokens grammarUpdated: -> # noop - -_.extend NullGrammar.prototype, EventEmitter diff --git a/src/project.coffee b/src/project.coffee index 2a8cf27be..6a61b5e65 100644 --- a/src/project.coffee +++ b/src/project.coffee @@ -19,6 +19,8 @@ Git = require 'git' # of directories and files that you can operate on. module.exports = class Project + _.extend @prototype, EventEmitter + @acceptsDocuments: true @version: 1 @@ -359,5 +361,3 @@ class Project subscriber.subscribe this, 'buffer-created', (buffer) -> callback(buffer) else @on 'buffer-created', (buffer) -> callback(buffer) - -_.extend Project.prototype, EventEmitter diff --git a/src/selection.coffee b/src/selection.coffee index e3bea3729..514cfe7d5 100644 --- a/src/selection.coffee +++ b/src/selection.coffee @@ -5,6 +5,8 @@ _ = require 'underscore' # Public: Represents a selection in the {EditSession}. module.exports = class Selection + _.extend @prototype, EventEmitter + cursor: null marker: null editSession: null @@ -546,5 +548,3 @@ class Selection screenRangeChanged: -> screenRange = @getScreenRange() @trigger 'screen-range-changed', screenRange - -_.extend Selection.prototype, EventEmitter diff --git a/src/syntax.coffee b/src/syntax.coffee index 95623431d..8a5b0a549 100644 --- a/src/syntax.coffee +++ b/src/syntax.coffee @@ -11,6 +11,8 @@ TextMateScopeSelector = require('first-mate').ScopeSelector module.exports = class Syntax + _.extend @prototype, EventEmitter + registerDeserializer(this) @deserialize: ({grammarOverridesByPath}) -> @@ -133,5 +135,3 @@ class Syntax cssSelectorFromScopeSelector: (scopeSelector) -> new TextMateScopeSelector(scopeSelector).toCssSelector() - -_.extend(Syntax.prototype, EventEmitter) diff --git a/src/task.coffee b/src/task.coffee index 9fa452783..442517a7f 100644 --- a/src/task.coffee +++ b/src/task.coffee @@ -4,6 +4,8 @@ EventEmitter = require 'event-emitter' module.exports = class Task + _.extend @prototype, EventEmitter + @once: (taskPath, args...) -> task = new Task(taskPath) task.one 'task:completed', -> task.terminate() @@ -56,5 +58,3 @@ class Task @childProcess = null @off() - -_.extend Task.prototype, EventEmitter diff --git a/src/text-buffer.coffee b/src/text-buffer.coffee index 00246de5e..0d90510fc 100644 --- a/src/text-buffer.coffee +++ b/src/text-buffer.coffee @@ -13,8 +13,8 @@ guid = require 'guid' # the case, as a `Buffer` could be an unsaved chunk of text. module.exports = class TextBuffer - _.extend(@prototype, EventEmitter) - _.extend(@prototype, Subscriber) + _.extend @prototype, EventEmitter + _.extend @prototype, Subscriber @acceptsDocuments: true @version: 2 diff --git a/src/tokenized-buffer.coffee b/src/tokenized-buffer.coffee index 22fc4ee09..c4ac782cb 100644 --- a/src/tokenized-buffer.coffee +++ b/src/tokenized-buffer.coffee @@ -10,6 +10,9 @@ telepath = require 'telepath' module.exports = class TokenizedBuffer + _.extend @prototype, EventEmitter + _.extend @prototype, Subscriber + grammar: null currentGrammarScore: null buffer: null @@ -323,6 +326,3 @@ class TokenizedBuffer for screenLine, row in @linesForScreenRows(0, @getLastRow()) lines.push "#{row}: #{screenLine.text}" lines.join('\n') - -_.extend(TokenizedBuffer.prototype, EventEmitter) -_.extend(TokenizedBuffer.prototype, Subscriber) diff --git a/src/window-event-handler.coffee b/src/window-event-handler.coffee index 03984579a..ed9fcce1a 100644 --- a/src/window-event-handler.coffee +++ b/src/window-event-handler.coffee @@ -7,6 +7,8 @@ fsUtils = require 'fs-utils' module.exports = class WindowEventHandler + _.extend @prototype, Subscriber + constructor: -> @subscribe ipc, 'command', (command, args...) -> $(window).trigger(command, args...) @@ -89,5 +91,3 @@ class WindowEventHandler previousElement = element (previousElement ? highestElement).focus() - -_.extend WindowEventHandler.prototype, Subscriber