Merge remote-tracking branch 'refs/remotes/origin/master' into wl-electron-35

2026-01-23 22:08:08 -05:00 · 2015-11-18 16:11:49 -05:00
parent 6c811433cf 17c5198299
commit 0945383d78
13 changed files with 165 additions and 60 deletions
--- a/atom.sh
+++ b/atom.sh
@@ -50,6 +50,10 @@ if [ $REDIRECT_STDERR ]; then
  exec 2> /dev/null
 fi

+if [ $EXPECT_OUTPUT ]; then
+  export ELECTRON_ENABLE_LOGGING=1
+fi
+
 if [ $OS == 'Mac' ]; then
  if [ -n "$BETA_VERSION" ]; then
    ATOM_APP_NAME="Atom Beta.app"
--- a/package.json
+++ b/package.json
@@ -99,7 +99,7 @@
    "link": "0.31.0",
    "markdown-preview": "0.156.2",
    "metrics": "0.53.0",
-    "notifications": "0.61.0",
+    "notifications": "0.62.0",
    "open-on-github": "0.40.0",
    "package-generator": "0.41.0",
    "release-notes": "0.53.0",
@@ -113,8 +113,8 @@
    "timecop": "0.33.0",
    "tree-view": "0.198.0",
    "update-package-dependencies": "0.10.0",
-    "welcome": "0.32.0",
-    "whitespace": "0.32.0",
+    "welcome": "0.33.0",
+    "whitespace": "0.32.1",
    "wrap-guide": "0.38.1",
    "language-c": "0.49.0",
    "language-clojure": "0.18.0",
@@ -127,7 +127,7 @@
    "language-html": "0.42.0",
    "language-hyperlink": "0.15.0",
    "language-java": "0.16.1",
-    "language-javascript": "0.100.0",
+    "language-javascript": "0.101.1",
    "language-json": "0.17.1",
    "language-less": "0.28.3",
    "language-make": "0.20.0",
@@ -136,8 +136,8 @@
    "language-perl": "0.31.0",
    "language-php": "0.34.0",
    "language-property-list": "0.8.0",
-    "language-python": "0.41.0",
-    "language-ruby": "0.62.0",
+    "language-python": "0.42.1",
+    "language-ruby": "0.64.0",
    "language-ruby-on-rails": "0.24.0",
    "language-sass": "0.43.0",
    "language-shellscript": "0.20.0",
@@ -146,7 +146,7 @@
    "language-text": "0.7.0",
    "language-todo": "0.27.0",
    "language-toml": "0.16.0",
-    "language-xml": "0.34.0",
+    "language-xml": "0.34.1",
    "language-yaml": "0.24.0"
  },
  "private": true,
--- a/resources/mac/atom-Info.plist
+++ b/resources/mac/atom-Info.plist
@@ -214,6 +214,20 @@
 			<key>LSHandlerRank</key>
 			<string>Alternate</string>
 		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>COMMIT_EDITMSG</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>file.icns</string>
+			<key>CFBundleTypeName</key>
+			<string>Commit message</string>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>LSHandlerRank</key>
+			<string>Alternate</string>
+		</dict>
 		<dict>
 			<key>CFBundleTypeExtensions</key>
 			<array>
@@ -228,6 +242,21 @@
 			<key>LSHandlerRank</key>
 			<string>Alternate</string>
 		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>clj</string>
+				<string>cljs</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>file.icns</string>
+			<key>CFBundleTypeName</key>
+			<string>Clojure source</string>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>LSHandlerRank</key>
+			<string>Alternate</string>
+		</dict>
 		<dict>
 			<key>CFBundleTypeExtensions</key>
 			<array>
@@ -422,6 +451,20 @@
 			<key>LSHandlerRank</key>
 			<string>Alternate</string>
 		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>go</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>file.icns</string>
+			<key>CFBundleTypeName</key>
+			<string>Go source</string>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>LSHandlerRank</key>
+			<string>Alternate</string>
+		</dict>
 		<dict>
 			<key>CFBundleTypeExtensions</key>
 			<array>
@@ -624,6 +667,20 @@
 			<key>LSHandlerRank</key>
 			<string>Alternate</string>
 		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>less</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>file.icns</string>
+			<key>CFBundleTypeName</key>
+			<string>Less source</string>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>LSHandlerRank</key>
+			<string>Alternate</string>
+		</dict>
 		<dict>
 			<key>CFBundleTypeExtensions</key>
 			<array>
@@ -702,6 +759,20 @@
 			<key>LSHandlerRank</key>
 			<string>Alternate</string>
 		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>mk</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>file.icns</string>
+			<key>CFBundleTypeName</key>
+			<string>Makefile source</string>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>LSHandlerRank</key>
+			<string>Alternate</string>
+		</dict>
 		<dict>
 			<key>CFBundleTypeExtensions</key>
 			<array>
@@ -809,6 +880,21 @@
 			<key>LSHandlerRank</key>
 			<string>Alternate</string>
 		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>mustache</string>
+				<string>hbs</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>file.icns</string>
+			<key>CFBundleTypeName</key>
+			<string>Mustache document</string>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>LSHandlerRank</key>
+			<string>Alternate</string>
+		</dict>
 		<dict>
 			<key>CFBundleTypeExtensions</key>
 			<array>
@@ -998,6 +1084,7 @@
 			<key>CFBundleTypeExtensions</key>
 			<array>
 				<string>rhtml</string>
+				<string>erb</string>
 			</array>
 			<key>CFBundleTypeIconFile</key>
 			<string>file.icns</string>
@@ -1039,6 +1126,21 @@
 			<key>LSHandlerRank</key>
 			<string>Alternate</string>
 		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>sass</string>
+				<string>scss</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>file.icns</string>
+			<key>CFBundleTypeName</key>
+			<string>Sass source</string>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>LSHandlerRank</key>
+			<string>Alternate</string>
+		</dict>
 		<dict>
 			<key>CFBundleTypeExtensions</key>
 			<array>
@@ -1243,6 +1345,20 @@
 			<key>LSHandlerRank</key>
 			<string>Alternate</string>
 		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>toml</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>file.icns</string>
+			<key>CFBundleTypeName</key>
+			<string>TOML file</string>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>LSHandlerRank</key>
+			<string>Alternate</string>
+		</dict>
 		<dict>
 			<key>CFBundleTypeExtensions</key>
 			<array>
--- a/resources/win/atom.cmd
+++ b/resources/win/atom.cmd
@@ -16,6 +16,7 @@ FOR %%a IN (%*) DO (
 )

 IF "%EXPECT_OUTPUT%"=="YES" (
+  SET ELECTRON_ENABLE_LOGGING=YES
  "%~dp0\..\..\atom.exe" %*
 ) ELSE (
  "%~dp0\..\app\apm\bin\node.exe" "%~dp0\atom.js" %*
--- a/resources/win/atom.sh
+++ b/resources/win/atom.sh
@@ -18,6 +18,7 @@ done
 directory=$(dirname "$0")

 if [ $EXPECT_OUTPUT ]; then
+  export ELECTRON_ENABLE_LOGGING=1
  "$directory/../../atom.exe" "$@"
 else
  "$directory/../app/apm/bin/node.exe" "$directory/atom.js" "$@"
--- a/spec/atom-environment-spec.coffee
+++ b/spec/atom-environment-spec.coffee
@@ -243,6 +243,21 @@ describe "AtomEnvironment", ->

      atomEnvironment.destroy()

+  describe "::destroy()", ->
+    it "does not throw exceptions when unsubscribing from ipc events (regression)", ->
+      configDirPath = temp.mkdirSync()
+      fakeDocument = {
+        addEventListener: ->
+        removeEventListener: ->
+        head: document.createElement('head')
+        body: document.createElement('body')
+      }
+      atomEnvironment = new AtomEnvironment({applicationDelegate: atom.applicationDelegate, window, document: fakeDocument})
+      spyOn(atomEnvironment.packages, 'getAvailablePackagePaths').andReturn []
+      atomEnvironment.startEditorWindow()
+      atomEnvironment.unloadEditorWindow()
+      atomEnvironment.destroy()
+
  describe "::openLocations(locations) (called via IPC from browser process)", ->
    beforeEach ->
      spyOn(atom.workspace, 'open')
--- a/spec/text-editor-spec.coffee
+++ b/spec/text-editor-spec.coffee
@@ -163,14 +163,8 @@ describe "TextEditor", ->
        expect(editor.getTitle()).toBe 'untitled'

    describe ".getLongTitle()", ->
-      it "appends the name of the containing directory to the basename of the file", ->
-        expect(editor.getLongTitle()).toBe 'sample.js - fixtures'
-        buffer.setPath(undefined)
-        expect(editor.getLongTitle()).toBe 'untitled'
-
-    describe ".getUniqueTitle()", ->
      it "returns file name when there is no opened file with identical name", ->
-        expect(editor.getUniqueTitle()).toBe 'sample.js'
+        expect(editor.getLongTitle()).toBe 'sample.js'
        buffer.setPath(undefined)
        expect(editor.getLongTitle()).toBe 'untitled'

@@ -183,8 +177,8 @@ describe "TextEditor", ->
            atom.workspace.open(path.join('sample-theme-2', 'readme')).then (o) ->
              editor2 = o
        runs ->
-          expect(editor1.getUniqueTitle()).toBe 'sample-theme-1/readme'
-          expect(editor2.getUniqueTitle()).toBe 'sample-theme-2/readme'
+          expect(editor1.getLongTitle()).toBe 'sample-theme-1/readme'
+          expect(editor2.getLongTitle()).toBe 'sample-theme-2/readme'

      it "or returns <parent-directory>/.../<filename> when opened files has identical file names", ->
        editor1 = null
@@ -195,8 +189,8 @@ describe "TextEditor", ->
            atom.workspace.open(path.join('sample-theme-2', 'src', 'js', 'main.js')).then (o) ->
              editor2 = o
        runs ->
-          expect(editor1.getUniqueTitle()).toBe 'sample-theme-1/.../main.js'
-          expect(editor2.getUniqueTitle()).toBe 'sample-theme-2/.../main.js'
+          expect(editor1.getLongTitle()).toBe 'sample-theme-1/.../main.js'
+          expect(editor2.getLongTitle()).toBe 'sample-theme-2/.../main.js'


    it "notifies ::onDidChangeTitle observers when the underlying buffer path changes", ->
--- a/spec/tokenized-buffer-spec.coffee
+++ b/spec/tokenized-buffer-spec.coffee
@@ -154,7 +154,7 @@ describe "TokenizedBuffer", ->
          it "updates tokens to reflect the change", ->
            buffer.setTextInRange([[0, 0], [2, 0]], "foo()\n7\n")

-            expect(tokenizedBuffer.tokenizedLineForRow(0).tokens[1]).toEqual(value: '(', scopes: ['source.js', 'meta.brace.round.js'])
+            expect(tokenizedBuffer.tokenizedLineForRow(0).tokens[1]).toEqual(value: '(', scopes: ['source.js', 'meta.function-call.js', 'punctuation.definition.arguments.begin.js'])
            expect(tokenizedBuffer.tokenizedLineForRow(1).tokens[0]).toEqual(value: '7', scopes: ['source.js', 'constant.numeric.js'])
            # line 2 is unchanged
            expect(tokenizedBuffer.tokenizedLineForRow(2).tokens[2]).toEqual(value: 'if', scopes: ['source.js', 'keyword.control.js'])
@@ -201,7 +201,7 @@ describe "TokenizedBuffer", ->
            expect(tokenizedBuffer.tokenizedLineForRow(0).tokens[0]).toEqual(value: 'var', scopes: ['source.js', 'storage.modifier.js'])

            # previous line 3 should be combined with input to form line 1
-            expect(tokenizedBuffer.tokenizedLineForRow(1).tokens[0]).toEqual(value: 'foo', scopes: ['source.js'])
+            expect(tokenizedBuffer.tokenizedLineForRow(1).tokens[0]).toEqual(value: 'foo', scopes: ['source.js', 'meta.function-call.js', 'entity.name.function.js'])
            expect(tokenizedBuffer.tokenizedLineForRow(1).tokens[6]).toEqual(value: '=', scopes: ['source.js', 'keyword.operator.assignment.js'])

            # lines below deleted regions should be shifted upward
@@ -245,12 +245,12 @@ describe "TokenizedBuffer", ->
            expect(tokenizedBuffer.tokenizedLineForRow(0).tokens[0]).toEqual( value: 'var', scopes: ['source.js', 'storage.modifier.js'])

            # 3 new lines inserted
-            expect(tokenizedBuffer.tokenizedLineForRow(1).tokens[0]).toEqual(value: 'foo', scopes: ['source.js'])
-            expect(tokenizedBuffer.tokenizedLineForRow(2).tokens[0]).toEqual(value: 'bar', scopes: ['source.js'])
-            expect(tokenizedBuffer.tokenizedLineForRow(3).tokens[0]).toEqual(value: 'baz', scopes: ['source.js'])
+            expect(tokenizedBuffer.tokenizedLineForRow(1).tokens[0]).toEqual(value: 'foo', scopes: ['source.js', 'meta.function-call.js', 'entity.name.function.js'])
+            expect(tokenizedBuffer.tokenizedLineForRow(2).tokens[0]).toEqual(value: 'bar', scopes: ['source.js', 'meta.function-call.js', 'entity.name.function.js'])
+            expect(tokenizedBuffer.tokenizedLineForRow(3).tokens[0]).toEqual(value: 'baz', scopes: ['source.js', 'meta.function-call.js', 'entity.name.function.js'])

            # previous line 2 is joined with quux() on line 4
-            expect(tokenizedBuffer.tokenizedLineForRow(4).tokens[0]).toEqual(value: 'quux', scopes: ['source.js'])
+            expect(tokenizedBuffer.tokenizedLineForRow(4).tokens[0]).toEqual(value: 'quux', scopes: ['source.js', 'meta.function-call.js', 'entity.name.function.js'])
            expect(tokenizedBuffer.tokenizedLineForRow(4).tokens[4]).toEqual(value: 'if', scopes: ['source.js', 'keyword.control.js'])

            # previous line 3 is pushed down to become line 5
--- a/src/application-delegate.coffee
+++ b/src/application-delegate.coffee
@@ -138,7 +138,7 @@ class ApplicationDelegate

    ipc.on('message', outerCallback)
    new Disposable ->
-      ipc.removeEventListener('message', outerCallback)
+      ipc.removeListener('message', outerCallback)

  onUpdateAvailable: (callback) ->
    outerCallback = (message, detail) ->
@@ -147,17 +147,17 @@ class ApplicationDelegate

    ipc.on('message', outerCallback)
    new Disposable ->
-      ipc.removeEventListener('message', outerCallback)
+      ipc.removeListener('message', outerCallback)

  onApplicationMenuCommand: (callback) ->
    ipc.on('command', callback)
    new Disposable ->
-      ipc.removeEventListener('command', callback)
+      ipc.removeListener('command', callback)

  onContextMenuCommand: (callback) ->
    ipc.on('context-command', callback)
    new Disposable ->
-      ipc.removeEventListener('context-command', callback)
+      ipc.removeListener('context-command', callback)

  didCancelWindowUnload: ->
    ipc.send('did-cancel-window-unload')
--- a/src/atom-environment.coffee
+++ b/src/atom-environment.coffee
@@ -623,7 +623,7 @@ class AtomEnvironment extends Model
    @registerDefaultTargetForKeymaps()

    @packages.loadPackages()
-
+    @loadStateSync()
    @document.body.appendChild(@views.getView(@workspace))

    @watchProjectPath()
--- a/src/initialize-application-window.coffee
+++ b/src/initialize-application-window.coffee
@@ -24,7 +24,6 @@ module.exports = ({blobStore}) ->
  })

  atom.displayWindow()
-  atom.loadStateSync()
  atom.startEditorWindow()

  # Workaround for focus getting cleared upon window creation
--- a/src/initialize-test-window.coffee
+++ b/src/initialize-test-window.coffee
@@ -21,16 +21,7 @@ module.exports = ({blobStore}) ->

    {testRunnerPath, legacyTestRunnerPath, headless, logFile, testPaths} = getWindowLoadSettings()

-    if headless
-      # Override logging in headless mode so it goes to the console, regardless
-      # of the --enable-logging flag to Electron.
-      console.log = (args...) ->
-        ipc.send 'write-to-stdout', args.join(' ') + '\n'
-      console.warn = (args...) ->
-        ipc.send 'write-to-stderr', args.join(' ') + '\n'
-      console.error = (args...) ->
-        ipc.send 'write-to-stderr', args.join(' ') + '\n'
-    else
+    unless headless
      # Show window synchronously so a focusout doesn't fire on input elements
      # that are focused in the very first spec run.
      remote.getCurrentWindow().show()
--- a/src/text-editor.coffee
+++ b/src/text-editor.coffee
@@ -586,18 +586,18 @@ class TextEditor extends Model
    else
      'untitled'

-  # Essential: Get unique title for display in other parts of the UI
-  # such as the window title.
+  # Essential: Get unique title for display in other parts of the UI, such as
+  # the window title.
  #
  # If the editor's buffer is unsaved, its title is "untitled"
  # If the editor's buffer is saved, its unique title is formatted as one
  # of the following,
  # * "<filename>" when it is the only editing buffer with this file name.
  # * "<unique-dir-prefix>/.../<filename>", where the "..." may be omitted
-  # if the the direct parent directory is already different.
+  #   if the the direct parent directory is already different.
  #
  # Returns a {String}
-  getUniqueTitle: ->
+  getLongTitle: ->
    if sessionPath = @getPath()
      title = @getTitle()

@@ -625,22 +625,6 @@ class TextEditor extends Model
    else
      'untitled'

-  # Essential: Get the editor's long title for display in other parts of the UI
-  # such as the window title.
-  #
-  # If the editor's buffer is saved, its long title is formatted as
-  # "<filename> - <directory>". If it is unsaved, its title is "untitled"
-  #
-  # Returns a {String}.
-  getLongTitle: ->
-    if sessionPath = @getPath()
-      fileName = path.basename(sessionPath)
-      directory = @project.relativize(path.dirname(sessionPath))
-      directory = if directory.length > 0 then directory else path.basename(path.dirname(sessionPath))
-      "#{fileName} - #{directory}"
-    else
-      'untitled'
-
  # Essential: Returns the {String} path of this editor's text buffer.
  getPath: -> @buffer.getPath()