Merge branch 'master' into mb-tree-sitter-parsers

package.json

@@ -1,7 +1,7 @@
 {
   "name": "atom",
   "productName": "Atom",
-  "version": "1.24.0-dev",
+  "version": "1.25.0-dev",
   "description": "A hackable text editor for the 21st Century.",
   "main": "./src/main-process/main.js",
   "repository": {
@@ -78,30 +78,30 @@
     "yargs": "^3.23.0"
   },
   "packageDependencies": {
-    "atom-dark-syntax": "0.28.0",
-    "atom-dark-ui": "0.53.0",
+    "atom-dark-syntax": "0.29.0",
+    "atom-dark-ui": "0.53.1",
     "atom-light-syntax": "0.29.0",
-    "atom-light-ui": "0.46.0",
+    "atom-light-ui": "0.46.1",
     "base16-tomorrow-dark-theme": "1.5.0",
     "base16-tomorrow-light-theme": "1.5.0",
-    "one-dark-ui": "1.10.8",
-    "one-light-ui": "1.10.8",
-    "one-dark-syntax": "1.8.0",
-    "one-light-syntax": "1.8.0",
-    "solarized-dark-syntax": "1.1.2",
-    "solarized-light-syntax": "1.1.2",
+    "one-dark-ui": "1.10.9",
+    "one-light-ui": "1.10.9",
+    "one-dark-syntax": "1.8.1",
+    "one-light-syntax": "1.8.1",
+    "solarized-dark-syntax": "1.1.3",
+    "solarized-light-syntax": "1.1.3",
     "about": "1.7.8",
     "archive-view": "0.64.1",
-    "autocomplete-atom-api": "0.10.5",
-    "autocomplete-css": "0.17.4",
-    "autocomplete-html": "0.8.3",
+    "autocomplete-atom-api": "0.10.6",
+    "autocomplete-css": "0.17.5",
+    "autocomplete-html": "0.8.4",
     "autocomplete-plus": "2.39.0",
     "autocomplete-snippets": "1.11.2",
     "autoflow": "0.29.0",
     "autosave": "0.24.6",
     "background-tips": "0.27.1",
     "bookmarks": "0.45.0",
-    "bracket-matcher": "0.88.0",
+    "bracket-matcher": "0.88.1",
     "command-palette": "0.43.0",
     "dalek": "0.2.1",
     "deprecation-cop": "0.56.9",
@@ -142,10 +142,10 @@
     "language-coffee-script": "0.49.3",
     "language-csharp": "0.14.3",
     "language-css": "0.42.8",
-    "language-gfm": "0.90.2",
+    "language-gfm": "0.90.3",
     "language-git": "0.19.1",
     "language-go": "0.45.0-2",
-    "language-html": "0.48.3",
+    "language-html": "0.48.4",
     "language-hyperlink": "0.16.3",
     "language-java": "0.27.6",
     "language-javascript": "0.128.0-2",
@@ -155,15 +155,15 @@
     "language-mustache": "0.14.4",
     "language-objective-c": "0.15.1",
     "language-perl": "0.38.1",
-    "language-php": "0.42.2",
+    "language-php": "0.43.0",
     "language-property-list": "0.9.1",
     "language-python": "0.46.0-0",
     "language-ruby": "0.71.4",
-    "language-ruby-on-rails": "0.25.2",
+    "language-ruby-on-rails": "0.25.3",
     "language-sass": "0.61.3",
     "language-shellscript": "0.26.0-0",
     "language-source": "0.9.0",
-    "language-sql": "0.25.8",
+    "language-sql": "0.25.9",
     "language-text": "0.7.3",
     "language-todo": "0.29.3",
     "language-toml": "0.18.1",

spec/theme-manager-spec.js

@@ -424,12 +424,12 @@ h2 {
       waitsForPromise(() => atom.themes.activateThemes())
     })
 
-    it('uses the default dark UI and syntax themes and logs a warning', function () {
+    it('uses the default one-dark UI and syntax themes and logs a warning', function () {
       const activeThemeNames = atom.themes.getActiveThemeNames()
       expect(console.warn.callCount).toBe(2)
       expect(activeThemeNames.length).toBe(2)
-      expect(activeThemeNames).toContain('atom-dark-ui')
-      expect(activeThemeNames).toContain('atom-dark-syntax')
+      expect(activeThemeNames).toContain('one-dark-ui')
+      expect(activeThemeNames).toContain('one-dark-syntax')
     })
   })
 
@@ -459,8 +459,8 @@ h2 {
       it('uses the default dark UI and syntax themes', function () {
         const activeThemeNames = atom.themes.getActiveThemeNames()
         expect(activeThemeNames.length).toBe(2)
-        expect(activeThemeNames).toContain('atom-dark-ui')
-        expect(activeThemeNames).toContain('atom-dark-syntax')
+        expect(activeThemeNames).toContain('one-dark-ui')
+        expect(activeThemeNames).toContain('one-dark-syntax')
       })
     })
 
@@ -471,10 +471,10 @@ h2 {
         waitsForPromise(() => atom.themes.activateThemes())
       })
 
-      it('uses the default dark UI theme', function () {
+      it('uses the default one-dark UI theme', function () {
         const activeThemeNames = atom.themes.getActiveThemeNames()
         expect(activeThemeNames.length).toBe(2)
-        expect(activeThemeNames).toContain('atom-dark-ui')
+        expect(activeThemeNames).toContain('one-dark-ui')
         expect(activeThemeNames).toContain('atom-light-syntax')
       })
     })
@@ -486,11 +486,11 @@ h2 {
         waitsForPromise(() => atom.themes.activateThemes())
       })
 
-      it('uses the default dark syntax theme', function () {
+      it('uses the default one-dark syntax theme', function () {
         const activeThemeNames = atom.themes.getActiveThemeNames()
         expect(activeThemeNames.length).toBe(2)
         expect(activeThemeNames).toContain('atom-light-ui')
-        expect(activeThemeNames).toContain('atom-dark-syntax')
+        expect(activeThemeNames).toContain('one-dark-syntax')
       })
     })
   })

src/theme-manager.js

@@ -136,12 +136,12 @@ class ThemeManager {
       ]
       themeNames = _.intersection(themeNames, builtInThemeNames)
       if (themeNames.length === 0) {
-        themeNames = ['atom-dark-syntax', 'atom-dark-ui']
+        themeNames = ['one-dark-syntax', 'one-dark-ui']
       } else if (themeNames.length === 1) {
         if (_.endsWith(themeNames[0], '-ui')) {
-          themeNames.unshift('atom-dark-syntax')
+          themeNames.unshift('one-dark-syntax')
         } else {
-          themeNames.push('atom-dark-ui')
+          themeNames.push('one-dark-ui')
         }
       }
     }