Merge branch 'master' into sm-move-bootstrap-to-npm

package.json

@@ -1,7 +1,7 @@
 {
   "name": "atom",
   "productName": "Atom",
-  "version": "1.9.0-dev",
+  "version": "1.10.0-dev",
   "description": "A hackable text editor for the 21st Century.",
   "main": "./src/main-process/main.js",
   "repository": {
@@ -42,7 +42,7 @@
     "mocha": "2.5.1",
     "normalize-package-data": "^2.0.0",
     "nslog": "^3",
-    "ohnogit": "0.0.12",
+    "ohnogit": "0.0.13",
     "oniguruma": "^5",
     "pathwatcher": "~6.5",
     "property-accessors": "^1.1.3",
@@ -70,8 +70,8 @@
     "atom-light-ui": "0.43.0",
     "base16-tomorrow-dark-theme": "1.1.0",
     "base16-tomorrow-light-theme": "1.1.1",
-    "one-dark-ui": "1.3.1",
-    "one-light-ui": "1.3.1",
+    "one-dark-ui": "1.3.2",
+    "one-light-ui": "1.3.2",
     "one-dark-syntax": "1.2.0",
     "one-light-syntax": "1.2.0",
     "solarized-dark-syntax": "1.0.2",
@@ -98,7 +98,7 @@
     "find-and-replace": "0.198.0",
     "go-to-line": "0.31.0",
     "grammar-selector": "0.48.1",
-    "image-view": "0.57.0",
+    "image-view": "0.58.0",
     "incompatible-packages": "0.26.1",
     "keybinding-resolver": "0.35.0",
     "line-ending-selector": "0.5.0",
@@ -111,10 +111,10 @@
     "settings-view": "0.238.0",
     "snippets": "1.0.2",
     "spell-check": "0.67.1",
-    "status-bar": "1.2.6",
-    "styleguide": "0.45.2",
+    "status-bar": "1.3.1",
+    "styleguide": "0.46.0",
     "symbols-view": "0.113.0",
-    "tabs": "0.97.0",
+    "tabs": "0.98.0",
     "timecop": "0.33.1",
     "tree-view": "0.208.0",
     "update-package-dependencies": "0.10.0",
@@ -125,17 +125,17 @@
     "language-clojure": "0.21.0",
     "language-coffee-script": "0.47.0",
     "language-csharp": "0.12.1",
-    "language-css": "0.36.1",
+    "language-css": "0.36.2",
     "language-gfm": "0.86.0",
     "language-git": "0.13.0",
     "language-go": "0.42.0",
     "language-html": "0.44.1",
     "language-hyperlink": "0.16.0",
-    "language-java": "0.21.0",
-    "language-javascript": "0.110.0",
+    "language-java": "0.22.0",
+    "language-javascript": "0.119.0",
     "language-json": "0.18.0",
     "language-less": "0.29.3",
-    "language-make": "0.22.0",
+    "language-make": "0.22.2",
     "language-mustache": "0.13.0",
     "language-objective-c": "0.15.1",
     "language-perl": "0.35.0",
@@ -151,7 +151,7 @@
     "language-text": "0.7.1",
     "language-todo": "0.28.0",
     "language-toml": "0.18.0",
-    "language-xml": "0.34.6",
+    "language-xml": "0.34.8",
     "language-yaml": "0.26.0"
   },
   "private": true,

spec/tokenized-buffer-spec.coffee

@@ -187,9 +187,9 @@ describe "TokenizedBuffer", ->
             buffer.delete([[1, 0], [3, 0]])
             changeHandler.reset()
 
-            expect(tokenizedBuffer.firstInvalidRow()).toBe 3
+            expect(tokenizedBuffer.firstInvalidRow()).toBe 2
             advanceClock()
-            expect(changeHandler).toHaveBeenCalledWith(start: 3, end: 7, delta: 0)
+            expect(changeHandler).toHaveBeenCalledWith(start: 2, end: 6, delta: 0)
 
         describe "when the change invalidates all the lines before the current invalid region", ->
           it "retokenizes the invalidated lines and continues into the valid region", ->
@@ -259,7 +259,7 @@ describe "TokenizedBuffer", ->
               expect(changeHandler).toHaveBeenCalled()
               [event] = changeHandler.argsForCall[0]
               delete event.bufferChange
-              expect(event).toEqual(start: 3, end: 5, delta: 0)
+              expect(event).toEqual(start: 3, end: 7, delta: 0)
 
           it "resumes highlighting with the state of the previous line", ->
             buffer.insert([0, 0], '/*')
@@ -309,7 +309,7 @@ describe "TokenizedBuffer", ->
             expect(changeHandler).toHaveBeenCalled()
             [event] = changeHandler.argsForCall[0]
             delete event.bufferChange
-            expect(event).toEqual(start: 3, end: 4, delta: 0)
+            expect(event).toEqual(start: 3, end: 7, delta: 0)
 
         describe "when lines are both updated and inserted", ->
           it "updates tokens to reflect the change", ->
@@ -360,7 +360,7 @@ describe "TokenizedBuffer", ->
             expect(changeHandler).toHaveBeenCalled()
             [event] = changeHandler.argsForCall[0]
             delete event.bufferChange
-            expect(event).toEqual(start: 5, end: 7, delta: 0)
+            expect(event).toEqual(start: 5, end: 9, delta: 0)
 
       describe "when there is an insertion that is larger than the chunk size", ->
         it "tokenizes the initial chunk synchronously, then tokenizes the remaining lines in the background", ->

src/initialize-test-window.coffee

@@ -35,10 +35,14 @@ module.exports = ({blobStore}) ->
       if (event.metaKey or event.ctrlKey) and event.altKey and event.keyCode is 73
         ipcRenderer.send('call-window-method', 'toggleDevTools')
 
-      # Reload: cmd-w / ctrl-w
+      # Close: cmd-w / ctrl-w
       if (event.metaKey or event.ctrlKey) and event.keyCode is 87
         ipcRenderer.send('call-window-method', 'close')
 
+      # Copy: cmd-c / ctrl-c
+      if (event.metaKey or event.ctrlKey) and event.keyCode is 67
+        ipcRenderer.send('call-window-method', 'copy')
+
     window.addEventListener('keydown', handleKeydown, true)
 
     # Add 'exports' to module search path.