Merge pull request #7123 from atom/ks-migrate-sublime-tabs

Re-enable tree-view and tabs when sublime-tabs is installed but not loaded

spec/fixtures/packages/sublime-tabs/package.json

@@ -0,0 +1,4 @@
+{
+  "name": "sublime-tabs",
+  "version": "1.0.0"
+}

spec/package-manager-spec.coffee

@@ -877,3 +877,32 @@ describe "PackageManager", ->
       runs ->
         expect(fs.isDirectorySync(autocompleteCSSPath)).toBe false
         expect(fs.isSymbolicLinkSync(autocompletePlusPath)).toBe true
+
+  describe "when the deprecated sublime-tabs package is installed", ->
+    grim = require 'grim'
+    includeDeprecatedAPIs = null
+
+    beforeEach ->
+      {includeDeprecatedAPIs} = grim
+      grim.includeDeprecatedAPIs = false
+
+    afterEach ->
+      grim.includeDeprecatedAPIs = includeDeprecatedAPIs
+
+    it "enables the tree-view and tabs package", ->
+      atom.config.pushAtKeyPath('core.disabledPackages', 'tree-view')
+      atom.config.pushAtKeyPath('core.disabledPackages', 'tabs')
+
+      spyOn(atom.packages, 'getAvailablePackagePaths').andReturn [
+        path.join(__dirname, 'fixtures', 'packages', 'sublime-tabs')
+        path.resolve(__dirname, '..', 'node_modules', 'tree-view')
+        path.resolve(__dirname, '..', 'node_modules', 'tabs')
+      ]
+      atom.packages.loadPackages()
+
+      waitsFor ->
+        not atom.packages.isPackageDisabled('tree-view') and not atom.packages.isPackageDisabled('tabs')
+
+      runs ->
+        expect(atom.packages.isPackageLoaded('tree-view')).toBe true
+        expect(atom.packages.isPackageLoaded('tabs')).toBe true

src/package-manager.coffee

@@ -314,6 +314,10 @@ class PackageManager
     @uninstallAutocompletePlus()
 
     packagePaths = @getAvailablePackagePaths()
+
+    # TODO: remove after a few atom versions.
+    @migrateSublimeTabsSettings(packagePaths)
+
     packagePaths = packagePaths.filter (packagePath) => not @isPackageDisabled(path.basename(packagePath))
     packagePaths = _.uniq packagePaths, (packagePath) -> path.basename(packagePath)
     @loadPackage(packagePath) for packagePath in packagePaths
@@ -445,6 +449,14 @@ class PackageManager
         @uninstallDirectory(dirToRemove)
     return
 
+  # TODO: remove this after a few versions
+  migrateSublimeTabsSettings: (packagePaths) ->
+    return if Grim.includeDeprecatedAPIs
+    for packagePath in packagePaths when path.basename(packagePath) is 'sublime-tabs'
+      atom.config.removeAtKeyPath('core.disabledPackages', 'tree-view')
+      atom.config.removeAtKeyPath('core.disabledPackages', 'tabs')
+    return
+
   uninstallDirectory: (directory) ->
     symlinkPromise = new Promise (resolve) ->
       fs.isSymbolicLink directory, (isSymLink) -> resolve(isSymLink)