From a2071a70938ca07807f5d5f11359fa972ae7555e Mon Sep 17 00:00:00 2001
From: Thomas Johansen <thomasjo@gmail.com>
Date: Sat, 5 Sep 2015 07:54:10 +0200
Subject: [PATCH] :fire: Remove deprecations from global atom module

---
 .../task-handler-with-deprecations.coffee     |  3 +-
 spec/menu-manager-spec.coffee                 |  6 +--
 src/atom.coffee                               | 47 +------------------
 3 files changed, 7 insertions(+), 49 deletions(-)

diff --git a/spec/fixtures/task-handler-with-deprecations.coffee b/spec/fixtures/task-handler-with-deprecations.coffee
index 6ba8e86e8..9a9b1295a 100644
--- a/spec/fixtures/task-handler-with-deprecations.coffee
+++ b/spec/fixtures/task-handler-with-deprecations.coffee
@@ -1,3 +1,4 @@
-{Git} = require 'atom'
+{deprecate} = require 'grim'
 
+deprecate('Fake task deprecation')
 module.exports = ->
diff --git a/spec/menu-manager-spec.coffee b/spec/menu-manager-spec.coffee
index f86b6e1a0..c047bbcfc 100644
--- a/spec/menu-manager-spec.coffee
+++ b/spec/menu-manager-spec.coffee
@@ -52,7 +52,7 @@ describe "MenuManager", ->
     it "sends the current menu template and associated key bindings to the browser process", ->
       spyOn(menu, 'sendToBrowserProcess')
       menu.add [{label: "A", submenu: [{label: "B", command: "b"}]}]
-      atom.keymap.add 'test', 'atom-workspace': 'ctrl-b': 'b'
+      atom.keymaps.add 'test', 'atom-workspace': 'ctrl-b': 'b'
       menu.update()
 
       waits 1
@@ -64,8 +64,8 @@ describe "MenuManager", ->
       # more dynamic interaction between the currently focused element and the menu
       spyOn(menu, 'sendToBrowserProcess')
       menu.add [{label: "A", submenu: [{label: "B", command: "b"}]}]
-      atom.keymap.add 'test', 'atom-workspace': 'ctrl-b': 'b'
-      atom.keymap.add 'test', 'atom-text-editor': 'ctrl-b': 'unset!'
+      atom.keymaps.add 'test', 'atom-workspace': 'ctrl-b': 'b'
+      atom.keymaps.add 'test', 'atom-text-editor': 'ctrl-b': 'unset!'
 
       waits 1
 
diff --git a/src/atom.coffee b/src/atom.coffee
index 3b4d8b6a6..23c9c2cec 100644
--- a/src/atom.coffee
+++ b/src/atom.coffee
@@ -6,7 +6,7 @@ remote = require 'remote'
 shell = require 'shell'
 
 _ = require 'underscore-plus'
-{deprecate, includeDeprecatedAPIs} = require 'grim'
+{deprecate} = require 'grim'
 {CompositeDisposable, Emitter} = require 'event-kit'
 fs = require 'fs-plus'
 {mapSourcePosition} = require 'source-map-support'
@@ -32,22 +32,6 @@ class Atom extends Model
     startTime = Date.now()
     atom = @deserialize(@loadState(mode)) ? new this({mode, @version})
     atom.deserializeTimings.atom = Date.now() -  startTime
-
-    if includeDeprecatedAPIs
-      serviceHubDeprecationMessage = """
-        atom.services is no longer available. To register service providers and
-        consumers, use the `providedServices` and `consumedServices` fields in
-        your package's package.json.
-      """
-
-      Object.defineProperty atom, 'services',
-        get: ->
-          deprecate(serviceHubDeprecationMessage)
-          atom.packages.serviceHub
-        set: (newValue) ->
-          deprecate(serviceHubDeprecationMessage)
-          atom.packages.serviceHub = newValue
-
     atom
 
   # Deserializes the Atom environment from a state object
@@ -196,7 +180,6 @@ class Atom extends Model
         @openDevTools()
         @executeJavaScriptInDevTools('DevToolsAPI.showConsole()')
 
-      @emit 'uncaught-error', arguments... if includeDeprecatedAPIs
       @emitter.emit 'did-throw-error', {message, url, line, column, originalError}
 
     @disposables?.dispose()
@@ -235,10 +218,6 @@ class Atom extends Model
 
     @config = new Config({configDirPath, resourcePath})
     @keymaps = new KeymapManager({configDirPath, resourcePath})
-
-    if includeDeprecatedAPIs
-      @keymap = @keymaps # Deprecated
-
     @keymaps.subscribeToFileReadFailure()
     @tooltips = new TooltipManager
     @notifications = new NotificationManager
@@ -252,14 +231,7 @@ class Atom extends Model
     @contextMenu = new ContextMenuManager({resourcePath, devMode})
     @menu = new MenuManager({resourcePath})
     @clipboard = new Clipboard()
-
     @grammars = @deserializers.deserialize(@state.grammars ? @state.syntax) ? new GrammarRegistry()
-
-    if includeDeprecatedAPIs
-      Object.defineProperty this, 'syntax', get: ->
-        deprecate "The atom.syntax global is deprecated. Use atom.grammars instead."
-        @grammars
-
     @disposables.add @packages.onDidActivateInitialPackages => @watchThemes()
 
     Project = require './project'
@@ -485,10 +457,6 @@ class Atom extends Model
   isMaximized: ->
     @getCurrentWindow().isMaximized()
 
-  isMaximixed: ->
-    deprecate "Use atom.isMaximized() instead"
-    @isMaximized()
-
   maximize: ->
     ipc.send('call-window-method', 'maximize')
 
@@ -748,11 +716,9 @@ class Atom extends Model
 
     startTime = Date.now()
     @workspace = Workspace.deserialize(@state.workspace) ? new Workspace
-
-    workspaceElement = @views.getView(@workspace)
-
     @deserializeTimings.workspace = Date.now() - startTime
 
+    workspaceElement = @views.getView(@workspace)
     @keymaps.defaultTarget = workspaceElement
     document.querySelector(@workspaceParentSelectorctor).appendChild(workspaceElement)
 
@@ -877,12 +843,3 @@ class Atom extends Model
 Promise.prototype.done = (callback) ->
   deprecate("Atom now uses ES6 Promises instead of Q. Call promise.then instead of promise.done")
   @then(callback)
-
-if includeDeprecatedAPIs
-  # Deprecated: Callers should be converted to use atom.deserializers
-  Atom::registerRepresentationClass = ->
-    deprecate("Callers should be converted to use atom.deserializers")
-
-  # Deprecated: Callers should be converted to use atom.deserializers
-  Atom::registerRepresentationClasses = ->
-    deprecate("Callers should be converted to use atom.deserializers")