Merge pull request #7176 from atom/mq-package-name-metadata

Only use package directory name as fallback

spec/fixtures/packages/package-with-different-directory-name/package.json

@@ -0,0 +1,4 @@
+{
+  "name": "package-with-a-totally-different-name",
+  "version": "1.0.0"
+}

spec/package-spec.coffee

@@ -105,3 +105,13 @@ describe "Package", ->
         theme.onDidDeactivate spy = jasmine.createSpy()
         theme.deactivate()
         expect(spy).toHaveBeenCalled()
+
+  describe ".loadMetadata()", ->
+    [packagePath, pack, metadata] = []
+
+    beforeEach ->
+      packagePath = atom.project.getDirectories()[0]?.resolve('packages/package-with-different-directory-name')
+      metadata = Package.loadMetadata(packagePath, true)
+
+    it "uses the package name defined in package.json", ->
+      expect(metadata.name).toBe 'package-with-a-totally-different-name'

src/package.coffee

@@ -45,7 +45,7 @@ class Package
           throw error unless ignoreErrors
 
     metadata ?= {}
-    metadata.name = packageName
+    metadata.name ?= packageName
 
     if includeDeprecatedAPIs and metadata.stylesheetMain?
       deprecate("Use the `mainStyleSheet` key instead of `stylesheetMain` in the `package.json` of `#{packageName}`", {packageName})