atom · lee-doppelganger · May 14, 2018 · May 17, 2018 · May 17, 2018 · May 18, 2018
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "atom",
   "productName": "Atom",
-  "version": "1.28.0-dev",
+  "version": "1.28.2",
   "description": "A hackable text editor for the 21st Century.",
   "main": "./src/main-process/main.js",
   "repository": {
@@ -12,7 +12,7 @@
     "url": "https://github.com/atom/atom/issues"
   },
   "license": "MIT",
-  "electronVersion": "2.0.0",
+  "electronVersion": "2.0.5",
   "dependencies": {
     "@atom/nsfw": "^1.0.18",
     "@atom/watcher": "1.0.3",
@@ -34,7 +34,7 @@
     "event-kit": "^2.4.0",
     "find-parent-dir": "^0.3.0",
     "first-mate": "7.1.0",
-    "focus-trap": "^2.3.0",
+        "focus-trap": "2.4.5",
     "fs-admin": "^0.1.6",
     "fs-plus": "^3.0.1",
     "fstream": "0.1.24",
@@ -74,7 +74,7 @@
     "text-buffer": "13.14.2",
     "tree-sitter": "^0.11.2",
     "typescript-simple": "1.0.0",
-    "underscore-plus": "^1.6.6",
+    "underscore-plus": "^1.6.8",
     "winreg": "^1.2.1",
     "yargs": "^3.23.0"
   },
@@ -92,7 +92,7 @@
     "solarized-dark-syntax": "1.1.4",
     "solarized-light-syntax": "1.1.4",
     "about": "1.9.1",
-    "archive-view": "0.64.5",
+    "archive-view": "0.64.6",
     "autocomplete-atom-api": "0.10.7",
     "autocomplete-css": "0.17.5",
     "autocomplete-html": "0.8.4",
@@ -109,16 +109,16 @@
     "dev-live-reload": "0.48.1",
     "encoding-selector": "0.23.9",
     "exception-reporting": "0.43.1",
-    "find-and-replace": "0.215.10",
-    "fuzzy-finder": "1.8.1",
-    "github": "0.15.0",
+    "find-and-replace": "0.215.11",
+    "fuzzy-finder": "1.8.2",
+    "github": "0.15.5",
     "git-diff": "1.3.9",
     "go-to-line": "0.33.0",
     "grammar-selector": "0.50.1",
     "image-view": "0.62.4",
     "incompatible-packages": "0.27.3",
     "keybinding-resolver": "0.38.1",
-    "line-ending-selector": "0.7.6",
+    "line-ending-selector": "0.7.7",
     "link": "0.31.4",
     "markd
10000
own-preview": "0.159.20",
     "metrics": "1.2.6",

diff --git a/src/config-schema.js b/src/config-schema.js
@@ -355,6 +355,21 @@ const configSchema = {
         type: 'boolean',
         default: false,
         description: 'Experimental: Use the new Tree-sitter parsing system for supported languages.'
+      },
+      colorProfile: {
+        description: "Specify whether Atom should use the operating system's color profile (recommended) or an alternative color profile.<br>Changing this setting will require a relaunch of Atom to take effect.",
+        type: 'string',
+        default: 'default',
+        enum: [
+          {
+            value: 'default',
+            description: 'Use color profile configured in the operating system'
+          },
+          {
+            value: 'srgb',
+            description: 'Use sRGB color profile'
+          }
+        ]
       }
     }
   },

diff --git a/src/main-process/atom-application.js b/src/main-process/atom-application.js
@@ -173,7 +173,8 @@ class AtomApplication extends EventEmitter {
     if (!this.configFilePromise) {
       this.configFilePromise = this.configFile.watch()
       this.disposable.add(await this.configFilePromise)
-      this.config.onDidChange('core.titleBar', this.promptForRestart.bind(this))
+      this.config.onDidChange('core.titleBar', () => this.promptForRestart())
+      this.config.onDidChange('core.colorProfile', () => this.promptForRestart())
     }
 
     const optionsForWindowsToOpen = []

diff --git a/src/main-process/atom-window.js b/src/main-process/atom-window.js
@@ -51,7 +51,7 @@ class AtomWindow extends EventEmitter {
     // taskbar's icon. See https://github.com/atom/atom/issues/4811 for more.
     if (process.platform === 'linux') options.icon = ICON_PATH
     if (this.shouldAddCustomTitleBar()) options.titleBarStyle = 'hidden'
-    if (this.shouldAddCustomInsetTitleBar()) options.titleBarStyle = 'hidden-inset'
+    if (this.shouldAddCustomInsetTitleBar()) options.titleBarStyle = 'hiddenInset'
     if (this.shouldHideTitleBar()) options.frame = false
     this.browserWindow = new BrowserWindow(options)
 

diff --git a/src/main-process/start.js b/src/main-process/start.js
@@ -5,6 +5,9 @@ const temp = require('temp').track()
 const parseCommandLine = require('./parse-command-line')
 const startCrashReporter = require('../crash-reporter-start')
 const atomPaths = require('../atom-paths')
+const fs = require('fs')
+const CSON = require('season')
+const Config = require('../config')
 
 module.exports = function start (resourcePath, startTime) {
   global.shellStartTime = startTime
@@ -39,6 +42,12 @@ module.exports = function start (resourcePath, startTime) {
   atomPaths.setUserData(app)
   setupCompileCache()
 
+  const config = getConfig()
+  const colorProfile = config.get('core.colorProfile')
+  if (colorProfile && colorProfile !== 'default') {
+    app.commandLine.appendSwitch('force-color-profile', colorProfile)
+  }
+
   if (handleStartupEventWithSquirrel()) {
     return
   } else if (args.test && args.mainProcess) {
@@ -97,3 +106,21 @@ function setupCompileCache () {
   CompileCache.setAtomHomeDirectory(process.env.ATOM_HOME)
   CompileCache.install(process.resourcesPath, require)
 }
+
+function getConfig () {
+  const config = new Config()
+
+  let configFilePath
+  if (fs.existsSync(path.join(process.env.ATOM_HOME, 'config.json'))) {
+    configFilePath = path.join(process.env.ATOM_HOME, 'config.json')
+  } else if (fs.existsSync(path.join(process.env.ATOM_HOME, 'config.cson'))) {
+    configFilePath = path.join(process.env.ATOM_HOME, 'config.cson')
+  }
+
+  if (configFilePath) {
+    const configFileData = CSON.readFileSync(configFilePath)
+    config.resetUserSettings(configFileData)
+  }
+
+  return config
+}
diff --git a/src/scope-descriptor.coffee b/src/scope-descriptor.coffee
diff --git a/src/scope-descriptor.js b/src/scope-descriptor.js
@@ -0,0 +1,80 @@
+// Extended: Wraps an {Array} of `String`s. The Array describes a path from the
+// root of the syntax tree to a token including _all_ scope names for the entire
+// path.
+//
+// Methods that take a `ScopeDescriptor` will also accept an {Array} of {String}
+// scope names e.g. `['.source.js']`.
+//
+// You can use `ScopeDescriptor`s to get language-specific config settings via
+// {Config::get}.
+//
+// You should not need to create a `ScopeDescriptor` directly.
+//
+// * {TextEditor::getRootScopeDescriptor} to get the language's descriptor.
+// * {TextEditor::scopeDescriptorForBufferPosition} to get the descriptor at a
+//   specific position in the buffer.
+// * {Cursor::getScopeDescriptor} to get a cursor's descriptor based on position.
+//
+// See the [scopes and scope descriptor guide](http://flight-manual.atom.io/behind-atom/sections/scoped-settings-scopes-and-scope-descriptors/)
+// for more information.
+module.exports =
+class ScopeDescriptor {
+  static fromObject (scopes) {
+    if (scopes instanceof ScopeDescriptor) {
+      return scopes
+    } else {
+      return new ScopeDescriptor({scopes})
+    }
+  }
+
+  /*
+  Section: Construction and Destruction
+  */
+
+  // Public: Create a {ScopeDescriptor} object.
+  //
+  // * `object` {Object}
+  //   * `scopes` {Array} of {String}s
+  constructor ({scopes}) {
+    this.scopes = scopes
+  }
+
+  // Public: Returns an {Array} of {String}s
+  getScopesArray () {
+    return this.scopes
+  }
+
+  getScopeChain () {
+    // For backward compatibility, prefix TextMate-style scope names with
+    // leading dots (e.g. 'source.js' -> '.source.js').
+    if (this.scopes[0] != null && this.scopes[0].includes('.')) {
+      let result = ''
+      for (let i = 0; i < this.scopes.length; i++) {
+        const scope = this.scopes[i]
+        if (i > 0) { result += ' ' }
+        if (scope[0] !== '.') { result += '.' }
+        result += scope
+      }
+      return result
+    } else {
+      return this.scopes.join(' ')
+    }
+  }
+
+  toString () {
+    return this.getScopeChain()
+  }
+
+  isEqual (other) {
+    if (this.scopes.length !== other.scopes.length) {
+      return false
+    }
+    for (let i = 0; i < this.scopes.length; i++) {
+      const scope = this.scopes[i]
+      if (scope !== other.scopes[i]) {
+        return false
+      }
+    }
+    return true
+  }
+}
diff --git a/vendor/jasmine.js b/vendor/jasmine.js
@@ -2317,6 +2317,14 @@ jasmine.Spec.prototype.waitsFor = function(latchFunction, optional_timeoutMessag
     }
   }
 
+  if (optional_timeoutMessage_ == null) {
+    const objectToCaptureStack = {}
+    Error.captureStackTrace(objectToCaptureStack, waitsFor)
+    const stack = objectToCaptureStack.stack
+    const line = stack.split('\n')[1]
+    optional_timeoutMessage_ = `condition ${line}`
+  }
+
   var waitsForFunc = new jasmine.WaitsForBlock(this.env, optional_timeout_, latchFunction_, optional_timeoutMessage_, this);
   this.addToQueue(waitsForFunc);
   return this;