From afbf01110343a7a666a719e2b40a25a9ff29f04b Mon Sep 17 00:00:00 2001 From: probablycorey Date: Tue, 1 Apr 2014 15:59:54 -0700 Subject: [PATCH 01/10] Add Grim dependency --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 56b79944e..0852bbc60 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,7 @@ "fstream": "0.1.24", "fuzzaldrin": "~1.1", "git-utils": "^1.2.1", + "grim": "^0.1.0", "guid": "0.0.10", "jasmine-tagged": ">=1.1.1 <2.0", "keytar": "1.x", From 56222a072af6d2df19d11461668875566051084e Mon Sep 17 00:00:00 2001 From: probablycorey Date: Tue, 1 Apr 2014 16:59:16 -0700 Subject: [PATCH 02/10] Add deprecation warnings --- src/atom.coffee | 3 +++ src/editor.coffee | 3 +++ src/pane-container-view.coffee | 2 ++ src/pane-view.coffee | 25 +++++++++++++++++++------ src/project.coffee | 7 +++++++ src/syntax.coffee | 5 ++++- src/workspace-view.coffee | 5 +++++ src/workspace.coffee | 3 +++ 8 files changed, 46 insertions(+), 7 deletions(-) diff --git a/src/atom.coffee b/src/atom.coffee index 868f66c01..d37a91c7d 100644 --- a/src/atom.coffee +++ b/src/atom.coffee @@ -8,6 +8,7 @@ screen = require 'screen' shell = require 'shell' _ = require 'underscore-plus' +{deprecated} = require 'grim' {Model} = require 'theorist' fs = require 'fs-plus' @@ -179,9 +180,11 @@ class Atom extends Model # Deprecated: Callers should be converted to use atom.deserializers registerRepresentationClass: -> + deprecated("Callers should be converted to use atom.deserializers") # Deprecated: Callers should be converted to use atom.deserializers registerRepresentationClasses: -> + deprecated("Callers should be converted to use atom.deserializers") setBodyPlatformClass: -> document.body.classList.add("platform-#{process.platform}") diff --git a/src/editor.coffee b/src/editor.coffee index 800eb3ba0..5e4b78ef0 100644 --- a/src/editor.coffee +++ b/src/editor.coffee @@ -2,6 +2,7 @@ _ = require 'underscore-plus' path = require 'path' Serializable = require 'serializable' Delegator = require 'delegato' +{deprecate} = require 'grim' {Model} = require 'theorist' {Point, Range} = require 'text-buffer' LanguageMode = require './language-mode' @@ -991,6 +992,7 @@ class Editor extends Model # Deprecated: Use {::duplicateLines} instead. duplicateLine: -> + deprecate("Use Editor::duplicateLines() instead") @duplicateLines() mutateSelectedText: (fn) -> @@ -1758,4 +1760,5 @@ class Editor extends Model # Deprecated: Call {::joinLines} instead. joinLine: -> + deprecate("Use Editor::joinLines() instead") @joinLines() diff --git a/src/pane-container-view.coffee b/src/pane-container-view.coffee index 2ed53b19b..e3ba97ed1 100644 --- a/src/pane-container-view.coffee +++ b/src/pane-container-view.coffee @@ -1,3 +1,4 @@ +{deprecate} = require 'grim' Delegator = require 'delegato' {$, View} = require './space-pen-extensions' PaneView = require './pane-view' @@ -146,4 +147,5 @@ class PaneContainerView extends View # Deprecated getPanes: -> + deprecate("Use PaneContainerView::getPaneViews() instead.") @getPaneViews() diff --git a/src/pane-view.coffee b/src/pane-view.coffee index b5b96b7a4..1055dfef1 100644 --- a/src/pane-view.coffee +++ b/src/pane-view.coffee @@ -1,5 +1,6 @@ {$, View} = require './space-pen-extensions' Delegator = require 'delegato' +{deprecate} = require 'grim' PropertyAccessors = require 'property-accessors' Pane = require './pane' @@ -81,22 +82,34 @@ class PaneView extends View @command 'pane:close-other-items', => @destroyInactiveItems() # Deprecated: Use ::destroyItem - removeItem: (item) -> @destroyItem(item) + removeItem: (item) -> + deprecate("Use PaneView::destroyItem instead") + @destroyItem(item) # Deprecated: Use ::activateItem - showItem: (item) -> @activateItem(item) + showItem: (item) -> + deprecate("Use PaneView::activateItem instead") + @activateItem(item) # Deprecated: Use ::activateItemForUri - showItemForUri: (item) -> @activateItemForUri(item) + showItemForUri: (item) -> + deprecate("Use PaneView::activateItemForUri instead") + @activateItemForUri(item) # Deprecated: Use ::activateItemAtIndex - showItemAtIndex: (index) -> @activateItemAtIndex(index) + showItemAtIndex: (index) -> + deprecate("Use PaneView::activateItemAtIndex instead") + @activateItemAtIndex(index) # Deprecated: Use ::activateNextItem - showNextItem: -> @activateNextItem() + showNextItem: -> + deprecate("Use PaneView::destroyItem instead") + @activateNextItem() # Deprecated: Use ::activatePreviousItem - showPreviousItem: -> @activatePreviousItem() + showPreviousItem: -> + deprecate("Use PaneView::activatePreviousItem instead") + @activatePreviousItem() afterAttach: (onDom) -> @focus() if @model.focused and onDom diff --git a/src/project.coffee b/src/project.coffee index 28a7bed42..f98bfbcac 100644 --- a/src/project.coffee +++ b/src/project.coffee @@ -4,6 +4,7 @@ url = require 'url' _ = require 'underscore-plus' fs = require 'fs-plus' Q = require 'q' +{deprecate} = require 'grim' {Model} = require 'theorist' {Emitter, Subscriber} = require 'emissary' Serializable = require 'serializable' @@ -127,6 +128,7 @@ class Project extends Model # Deprecated openSync: (filePath, options={}) -> + deprecate("Use Project::open instead.") filePath = @resolve(filePath) @buildEditorForBuffer(@bufferForPathSync(filePath), options) @@ -177,6 +179,7 @@ class Project extends Model # DEPRECATED buildBufferSync: (absoluteFilePath) -> + deprecate("Use Project::buildBuffer instead.") buffer = new TextBuffer({filePath: absoluteFilePath}) @addBuffer(buffer) buffer.loadSync() @@ -317,17 +320,21 @@ class Project extends Model # Deprecated: delegate registerOpener: (opener) -> + deprecate("Use WorkSpace::registerOpener instead") @openers.push(opener) # Deprecated: delegate unregisterOpener: (opener) -> + deprecate("Use WorkSpace::unregisterOpener instead") _.remove(@openers, opener) # Deprecated: delegate eachEditor: (callback) -> + deprecate("Use WorkSpace::eachEditor instead") callback(editor) for editor in @getEditors() @on 'editor-created', (editor) -> callback(editor) # Deprecated: delegate getEditors: -> + deprecate("Use WorkSpace::getEditors instead") new Array(@editors...) diff --git a/src/syntax.coffee b/src/syntax.coffee index c2d1b22bb..371a259b8 100644 --- a/src/syntax.coffee +++ b/src/syntax.coffee @@ -1,4 +1,5 @@ _ = require 'underscore-plus' +{deprecate} = require 'grim' {specificity} = require 'clear-cut' {Subscriber} = require 'emissary' {GrammarRegistry, ScopeSelector} = require 'first-mate' @@ -35,7 +36,9 @@ class Syntax extends GrammarRegistry createToken: (value, scopes) -> new Token({value, scopes}) # Deprecated: Used by settings-view to display snippets for packages - @::accessor 'scopedProperties', -> @propertyStore.propertySets + @::accessor 'scopedProperties', -> + deprecate("Use Syntax::getProperty instead.") + @propertyStore.propertySets addProperties: (args...) -> name = args.shift() if args.length > 2 diff --git a/src/workspace-view.coffee b/src/workspace-view.coffee index eb904f119..ba9ac325f 100644 --- a/src/workspace-view.coffee +++ b/src/workspace-view.coffee @@ -3,6 +3,7 @@ path = require 'path' Q = require 'q' _ = require 'underscore-plus' Delegator = require 'delegato' +{deprecate} = require 'grim' scrollbarStyle = require 'scrollbar-style' {$, $$, View} = require './space-pen-extensions' fs = require 'fs-plus' @@ -334,16 +335,20 @@ class WorkspaceView extends View # Deprecated eachPane: (callback) -> + deprecate("Use WorkSpaceView::eachPaneView instead") @eachPaneView(callback) # Deprecated getPanes: -> + deprecate("Use WorkSpaceView::getPaneViews instead") @getPaneViews() # Deprecated getActivePane: -> + deprecate("Use WorkSpaceView::getActivePaneView instead") @getActivePaneView() # Deprecated: Call {Workspace::getActivePaneItem} instead. getActivePaneItem: -> + deprecate("Use Workspace::getActivePaneItem instead") @model.activePaneItem diff --git a/src/workspace.coffee b/src/workspace.coffee index c34b7dd79..1f301a94e 100644 --- a/src/workspace.coffee +++ b/src/workspace.coffee @@ -1,3 +1,4 @@ +{deprecate} = require 'grim' {remove, last} = require 'underscore-plus' {join} = require 'path' {Model} = require 'theorist' @@ -114,6 +115,8 @@ class Workspace extends Model # :activatePane - A {Boolean} indicating whether to call {Pane::activate} on # the containing pane. Defaults to `true`. openSync: (uri='', options={}) -> + deprecate("Don't use the `changeFocus` option") if options.changeFocus? + {initialLine} = options # TODO: Remove deprecated changeFocus option activatePane = options.activatePane ? options.changeFocus ? true From 8c6ed69176f5e2a0bc3d63493bc3071fb39d2d4d Mon Sep 17 00:00:00 2001 From: probablycorey Date: Tue, 1 Apr 2014 16:59:24 -0700 Subject: [PATCH 03/10] Upgrade to Grim@0.2.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0852bbc60..7e0f91fd2 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "fstream": "0.1.24", "fuzzaldrin": "~1.1", "git-utils": "^1.2.1", - "grim": "^0.1.0", + "grim": "0.2.0", "guid": "0.0.10", "jasmine-tagged": ">=1.1.1 <2.0", "keytar": "1.x", From 9324b538f74bf5f1a420158bcf1c7733923f513e Mon Sep 17 00:00:00 2001 From: Corey Johnson Date: Wed, 2 Apr 2014 10:10:28 -0700 Subject: [PATCH 04/10] Upgrade to grim@0.3.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7e0f91fd2..d8cc5bae5 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "fstream": "0.1.24", "fuzzaldrin": "~1.1", "git-utils": "^1.2.1", - "grim": "0.2.0", + "grim": "0.3.0", "guid": "0.0.10", "jasmine-tagged": ">=1.1.1 <2.0", "keytar": "1.x", From ca016ce1166ab01dd2778ded4192dddeb82b3502 Mon Sep 17 00:00:00 2001 From: probablycorey Date: Thu, 3 Apr 2014 09:19:02 -0700 Subject: [PATCH 05/10] Update Grim --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d8cc5bae5..a201735b1 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "fstream": "0.1.24", "fuzzaldrin": "~1.1", "git-utils": "^1.2.1", - "grim": "0.3.0", + "grim": "0.4.0", "guid": "0.0.10", "jasmine-tagged": ">=1.1.1 <2.0", "keytar": "1.x", From 0b0dbbe4ee92055cc2ed2d3b58858cb02613ef34 Mon Sep 17 00:00:00 2001 From: probablycorey Date: Thu, 3 Apr 2014 09:19:33 -0700 Subject: [PATCH 06/10] Add window:log-deprecation-warnings command --- src/workspace-view.coffee | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/workspace-view.coffee b/src/workspace-view.coffee index ba9ac325f..82386e6ba 100644 --- a/src/workspace-view.coffee +++ b/src/workspace-view.coffee @@ -3,7 +3,7 @@ path = require 'path' Q = require 'q' _ = require 'underscore-plus' Delegator = require 'delegato' -{deprecate} = require 'grim' +{deprecate, logDeprecationWarnings} = require 'grim' scrollbarStyle = require 'scrollbar-style' {$, $$, View} = require './space-pen-extensions' fs = require 'fs-plus' @@ -141,8 +141,8 @@ class WorkspaceView extends View @command 'window:focus-pane-on-left', => @focusPaneViewOnLeft() @command 'window:focus-pane-on-right', => @focusPaneViewOnRight() @command 'window:save-all', => @saveAll() - @command 'window:toggle-invisibles', => - atom.config.toggle("editor.showInvisibles") + @command 'window:toggle-invisibles', => atom.config.toggle("editor.showInvisibles") + @command 'window:log-deprecation-warnings', => logDeprecationWarnings() @command 'window:toggle-auto-indent', => atom.config.toggle("editor.autoIndent") From bcf178104077cf67c6b94768d12cadb344c3affa Mon Sep 17 00:00:00 2001 From: probablycorey Date: Thu, 3 Apr 2014 10:17:27 -0700 Subject: [PATCH 07/10] Upgrade to grim@0.6.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a201735b1..0297a1842 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "fstream": "0.1.24", "fuzzaldrin": "~1.1", "git-utils": "^1.2.1", - "grim": "0.4.0", + "grim": "0.6.0", "guid": "0.0.10", "jasmine-tagged": ">=1.1.1 <2.0", "keytar": "1.x", From e58c2d8368a044cad0779075bc9dd1a978dbc4cb Mon Sep 17 00:00:00 2001 From: probablycorey Date: Thu, 3 Apr 2014 10:37:20 -0700 Subject: [PATCH 08/10] Fix WorkSpace typo --- src/project.coffee | 8 ++++---- src/workspace-view.coffee | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/project.coffee b/src/project.coffee index f98bfbcac..c6acf4139 100644 --- a/src/project.coffee +++ b/src/project.coffee @@ -320,21 +320,21 @@ class Project extends Model # Deprecated: delegate registerOpener: (opener) -> - deprecate("Use WorkSpace::registerOpener instead") + deprecate("Use Workspace::registerOpener instead") @openers.push(opener) # Deprecated: delegate unregisterOpener: (opener) -> - deprecate("Use WorkSpace::unregisterOpener instead") + deprecate("Use Workspace::unregisterOpener instead") _.remove(@openers, opener) # Deprecated: delegate eachEditor: (callback) -> - deprecate("Use WorkSpace::eachEditor instead") + deprecate("Use Workspace::eachEditor instead") callback(editor) for editor in @getEditors() @on 'editor-created', (editor) -> callback(editor) # Deprecated: delegate getEditors: -> - deprecate("Use WorkSpace::getEditors instead") + deprecate("Use Workspace::getEditors instead") new Array(@editors...) diff --git a/src/workspace-view.coffee b/src/workspace-view.coffee index 82386e6ba..72f98cf55 100644 --- a/src/workspace-view.coffee +++ b/src/workspace-view.coffee @@ -335,17 +335,17 @@ class WorkspaceView extends View # Deprecated eachPane: (callback) -> - deprecate("Use WorkSpaceView::eachPaneView instead") + deprecate("Use WorkspaceView::eachPaneView instead") @eachPaneView(callback) # Deprecated getPanes: -> - deprecate("Use WorkSpaceView::getPaneViews instead") + deprecate("Use WorkspaceView::getPaneViews instead") @getPaneViews() # Deprecated getActivePane: -> - deprecate("Use WorkSpaceView::getActivePaneView instead") + deprecate("Use WorkspaceView::getActivePaneView instead") @getActivePaneView() # Deprecated: Call {Workspace::getActivePaneItem} instead. From d0276e60b5910ae36a6e5f9bd21ee146cef20401 Mon Sep 17 00:00:00 2001 From: probablycorey Date: Fri, 4 Apr 2014 14:52:48 -0700 Subject: [PATCH 09/10] Remove periods --- src/pane-container-view.coffee | 2 +- src/project.coffee | 4 ++-- src/syntax.coffee | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pane-container-view.coffee b/src/pane-container-view.coffee index e3ba97ed1..1421b1283 100644 --- a/src/pane-container-view.coffee +++ b/src/pane-container-view.coffee @@ -147,5 +147,5 @@ class PaneContainerView extends View # Deprecated getPanes: -> - deprecate("Use PaneContainerView::getPaneViews() instead.") + deprecate("Use PaneContainerView::getPaneViews() instead") @getPaneViews() diff --git a/src/project.coffee b/src/project.coffee index c6acf4139..81f7eaa8c 100644 --- a/src/project.coffee +++ b/src/project.coffee @@ -128,7 +128,7 @@ class Project extends Model # Deprecated openSync: (filePath, options={}) -> - deprecate("Use Project::open instead.") + deprecate("Use Project::open instead") filePath = @resolve(filePath) @buildEditorForBuffer(@bufferForPathSync(filePath), options) @@ -179,7 +179,7 @@ class Project extends Model # DEPRECATED buildBufferSync: (absoluteFilePath) -> - deprecate("Use Project::buildBuffer instead.") + deprecate("Use Project::buildBuffer instead") buffer = new TextBuffer({filePath: absoluteFilePath}) @addBuffer(buffer) buffer.loadSync() diff --git a/src/syntax.coffee b/src/syntax.coffee index 371a259b8..73f6a3755 100644 --- a/src/syntax.coffee +++ b/src/syntax.coffee @@ -37,7 +37,7 @@ class Syntax extends GrammarRegistry # Deprecated: Used by settings-view to display snippets for packages @::accessor 'scopedProperties', -> - deprecate("Use Syntax::getProperty instead.") + deprecate("Use Syntax::getProperty instead") @propertyStore.propertySets addProperties: (args...) -> From 86842658c042cd16ab6e46a05f56da0129396cf8 Mon Sep 17 00:00:00 2001 From: probablycorey Date: Fri, 4 Apr 2014 14:56:10 -0700 Subject: [PATCH 10/10] Use skinny arrows --- src/workspace-view.coffee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/workspace-view.coffee b/src/workspace-view.coffee index 2c316c845..9e46f26f8 100644 --- a/src/workspace-view.coffee +++ b/src/workspace-view.coffee @@ -141,8 +141,8 @@ class WorkspaceView extends View @command 'window:focus-pane-on-left', => @focusPaneViewOnLeft() @command 'window:focus-pane-on-right', => @focusPaneViewOnRight() @command 'window:save-all', => @saveAll() - @command 'window:toggle-invisibles', => atom.config.toggle("editor.showInvisibles") - @command 'window:log-deprecation-warnings', => logDeprecationWarnings() + @command 'window:toggle-invisibles', -> atom.config.toggle("editor.showInvisibles") + @command 'window:log-deprecation-warnings', -> logDeprecationWarnings() @command 'window:toggle-auto-indent', => atom.config.toggle("editor.autoIndent")