From 7e34164c4bed65394f7c9818cb0b84eec8375adb Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Fri, 29 May 2015 14:55:48 -0700 Subject: [PATCH 1/6] Keep old folder names in api preview mode --- src/package.coffee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/package.coffee b/src/package.coffee index 65c7af822..d55de19db 100644 --- a/src/package.coffee +++ b/src/package.coffee @@ -277,7 +277,7 @@ class Package [stylesheetPath, atom.themes.loadStylesheet(stylesheetPath, true)] getStylesheetsPath: -> - if includeDeprecatedAPIs and fs.isDirectorySync(path.join(@path, 'stylesheets')) + if fs.isDirectorySync(path.join(@path, 'stylesheets')) deprecate("Store package style sheets in the `styles/` directory instead of `stylesheets/` in the `#{@name}` package", packageName: @name) path.join(@path, 'stylesheets') else @@ -353,7 +353,7 @@ class Package deferred = Q.defer() - if includeDeprecatedAPIs and fs.isDirectorySync(path.join(@path, 'scoped-properties')) + if fs.isDirectorySync(path.join(@path, 'scoped-properties')) settingsDirPath = path.join(@path, 'scoped-properties') deprecate("Store package settings files in the `settings/` directory instead of `scoped-properties/`", packageName: @name) else From 3c647dc7af65f6bde49a1993ddf004d3c749408c Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Fri, 29 May 2015 14:56:40 -0700 Subject: [PATCH 2/6] Keep activate events in api preview mode --- src/package.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/package.coffee b/src/package.coffee index d55de19db..130918af7 100644 --- a/src/package.coffee +++ b/src/package.coffee @@ -489,7 +489,7 @@ class Package else if _.isArray(commands) @activationCommands[selector].push(commands...) - if includeDeprecatedAPIs and @metadata.activationEvents? + if @metadata.activationEvents? deprecate(""" Use `activationCommands` instead of `activationEvents` in your package.json Commands should be grouped by selector as follows: From 558d10434ab0b76ea07f420594f51f1a11fd5460 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Fri, 29 May 2015 14:58:39 -0700 Subject: [PATCH 3/6] Keep old context menu format in api preview mode --- src/package.coffee | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/package.coffee b/src/package.coffee index 130918af7..a3fbf9e39 100644 --- a/src/package.coffee +++ b/src/package.coffee @@ -203,16 +203,15 @@ class Package try itemsBySelector = map['context-menu'] - if includeDeprecatedAPIs - # Detect deprecated format for items object - for key, value of itemsBySelector - unless _.isArray(value) - deprecate(""" - The context menu CSON format has changed. Please see - https://atom.io/docs/api/latest/ContextMenuManager#context-menu-cson-format - for more info. - """, {packageName: @name}) - itemsBySelector = atom.contextMenu.convertLegacyItemsBySelector(itemsBySelector) + # Detect deprecated format for items object + for key, value of itemsBySelector + unless _.isArray(value) + deprecate(""" + The context menu CSON format has changed. Please see + https://atom.io/docs/api/latest/ContextMenuManager#context-menu-cson-format + for more info. + """, {packageName: @name}) + itemsBySelector = atom.contextMenu.convertLegacyItemsBySelector(itemsBySelector) @activationDisposables.add(atom.contextMenu.add(itemsBySelector)) catch error From fed19872b36296e1c1f4756ea5e0b6e036ca8e7b Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Fri, 29 May 2015 14:59:49 -0700 Subject: [PATCH 4/6] Keep old configDefaults support in api preview mode --- src/package.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/package.coffee b/src/package.coffee index a3fbf9e39..b404f99e8 100644 --- a/src/package.coffee +++ b/src/package.coffee @@ -170,7 +170,7 @@ class Package if @mainModule? if @mainModule.config? and typeof @mainModule.config is 'object' atom.config.setSchema @name, {type: 'object', properties: @mainModule.config} - else if includeDeprecatedAPIs and @mainModule.configDefaults? and typeof @mainModule.configDefaults is 'object' + else if @mainModule.configDefaults? and typeof @mainModule.configDefaults is 'object' deprecate("""Use a config schema instead. See the configuration section of https://atom.io/docs/latest/hacking-atom-package-word-count and https://atom.io/docs/api/latest/Config for more details""", {packageName: @name}) From 703eaac7ca159b041352f47bb615bdd74d20adf3 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 1 Jun 2015 13:32:03 -0700 Subject: [PATCH 5/6] Keep around atom.config.unobserve no-op --- src/config.coffee | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/config.coffee b/src/config.coffee index 9ab8ce607..de907b8dd 100644 --- a/src/config.coffee +++ b/src/config.coffee @@ -1158,6 +1158,9 @@ withoutEmptyObjects = (object) -> resultObject = object resultObject +Config::unobserve = (keyPath) -> + Grim.deprecate 'Config::unobserve no longer does anything. Call `.dispose()` on the object returned by Config::observe instead.' + if Grim.includeDeprecatedAPIs EmitterMixin = require('emissary').Emitter EmitterMixin.includeInto(Config) @@ -1207,9 +1210,6 @@ if Grim.includeDeprecatedAPIs Grim.deprecate 'Config::toggle is no longer supported. Please remove from your code.' @set(keyPath, not @get(keyPath)) - Config::unobserve = (keyPath) -> - Grim.deprecate 'Config::unobserve no longer does anything. Call `.dispose()` on the object returned by Config::observe instead.' - Config::addScopedSettings = (source, selector, value, options) -> Grim.deprecate("Use ::set instead") settingsBySelector = {} From 66620f85105fed8ec095a802bd5e1cc9014348da Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 1 Jun 2015 13:32:38 -0700 Subject: [PATCH 6/6] Add TODO comment --- src/config.coffee | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config.coffee b/src/config.coffee index de907b8dd..f781e02e9 100644 --- a/src/config.coffee +++ b/src/config.coffee @@ -1158,6 +1158,7 @@ withoutEmptyObjects = (object) -> resultObject = object resultObject +# TODO remove in 1.0 API Config::unobserve = (keyPath) -> Grim.deprecate 'Config::unobserve no longer does anything. Call `.dispose()` on the object returned by Config::observe instead.'