From 7ec14b5be5a0d83a8649574befef6c2c354d9a4c Mon Sep 17 00:00:00 2001 From: Jessica Lord Date: Fri, 1 May 2015 11:45:38 -0700 Subject: [PATCH 01/20] Remove completions from Settings --- src/config-schema.coffee | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/config-schema.coffee b/src/config-schema.coffee index f181e0149..548b35fa8 100644 --- a/src/config-schema.coffee +++ b/src/config-schema.coffee @@ -98,9 +98,6 @@ module.exports = type: ['string', 'null'] # These can be used as globals or scoped, thus defaults. - completions: - type: ['array', 'object'] - default: [] fontFamily: type: 'string' default: '' From 81075739d54be33e6f41ff82be3627e787704ff7 Mon Sep 17 00:00:00 2001 From: Jessica Lord Date: Fri, 1 May 2015 13:19:07 -0700 Subject: [PATCH 02/20] Just remove default, leave type --- src/config-schema.coffee | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/config-schema.coffee b/src/config-schema.coffee index 548b35fa8..89d7034ba 100644 --- a/src/config-schema.coffee +++ b/src/config-schema.coffee @@ -98,6 +98,8 @@ module.exports = type: ['string', 'null'] # These can be used as globals or scoped, thus defaults. + completions: + type: ['array', 'object'] fontFamily: type: 'string' default: '' From 70bd04f7df37b80a4e622586b3a1ab49c6f61347 Mon Sep 17 00:00:00 2001 From: Ivan Zuzak Date: Mon, 4 May 2015 13:36:18 +0200 Subject: [PATCH 03/20] Allow 0 to be passed as initialLine --- src/browser/atom-application.coffee | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/browser/atom-application.coffee b/src/browser/atom-application.coffee index 178755786..c3e97defb 100644 --- a/src/browser/atom-application.coffee +++ b/src/browser/atom-application.coffee @@ -518,11 +518,11 @@ class AtomApplication [fileToOpen, initialLine, initialColumn] = path.basename(pathToOpen).split(':') return {pathToOpen} unless initialLine - return {pathToOpen} unless parseInt(initialLine) > 0 + return {pathToOpen} unless parseInt(initialLine) >= 0 # Convert line numbers to a base of 0 - initialLine -= 1 if initialLine - initialColumn -= 1 if initialColumn + initialLine = Math.max(0, initialLine - 1) if initialLine + initialColumn = Math.max(0, initialColumn - 1) if initialColumn pathToOpen = path.join(path.dirname(pathToOpen), fileToOpen) {pathToOpen, initialLine, initialColumn} From b12126a628a15a12e38f834a6f9e07e024a71f7a Mon Sep 17 00:00:00 2001 From: Jessica Lord Date: Mon, 4 May 2015 14:16:20 -0700 Subject: [PATCH 04/20] Revert "Just remove default, leave type" This reverts commit 81075739d54be33e6f41ff82be3627e787704ff7. --- src/config-schema.coffee | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/config-schema.coffee b/src/config-schema.coffee index 89d7034ba..548b35fa8 100644 --- a/src/config-schema.coffee +++ b/src/config-schema.coffee @@ -98,8 +98,6 @@ module.exports = type: ['string', 'null'] # These can be used as globals or scoped, thus defaults. - completions: - type: ['array', 'object'] fontFamily: type: 'string' default: '' From 3d4a4abd2262350a0e32901b449c03e7d761ed1b Mon Sep 17 00:00:00 2001 From: Ben Ogle Date: Mon, 4 May 2015 16:41:48 -0700 Subject: [PATCH 05/20] :arrow_up: snippets@0.89.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 36ebaa55a..54745a3e9 100644 --- a/package.json +++ b/package.json @@ -112,7 +112,7 @@ "package-generator": "0.38.0", "release-notes": "0.52.0", "settings-view": "0.196.0", - "snippets": "0.88.0", + "snippets": "0.89.0", "spell-check": "0.56.0", "status-bar": "0.69.0", "styleguide": "0.44.0", From e8ca3745b13db049b437470903a51c36918a0538 Mon Sep 17 00:00:00 2001 From: Ben Ogle Date: Tue, 5 May 2015 15:27:09 -0700 Subject: [PATCH 06/20] :arrow_up: language-css@0.29.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 54745a3e9..26dadd7fc 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "language-clojure": "0.14.0", "language-coffee-script": "0.40.0", "language-csharp": "0.5.0", - "language-css": "0.28.0", + "language-css": "0.29.0", "language-gfm": "0.71.0", "language-git": "0.10.0", "language-go": "0.25.0", From b563eabd7a70eac5a8228c08b764c361cdb5b992 Mon Sep 17 00:00:00 2001 From: Ben Ogle Date: Tue, 5 May 2015 15:27:24 -0700 Subject: [PATCH 07/20] :arrow_up: language-less@0.27.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 26dadd7fc..95d6460e9 100644 --- a/package.json +++ b/package.json @@ -137,7 +137,7 @@ "language-java": "0.15.0", "language-javascript": "0.76.0", "language-json": "0.14.0", - "language-less": "0.26.0", + "language-less": "0.27.0", "language-make": "0.14.0", "language-mustache": "0.11.0", "language-objective-c": "0.15.0", From 3c6e6e4538466d38d36f7ceac120bba384080192 Mon Sep 17 00:00:00 2001 From: Ben Ogle Date: Tue, 5 May 2015 15:27:38 -0700 Subject: [PATCH 08/20] :arrow_up: language-sass@0.37.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 95d6460e9..585e1b451 100644 --- a/package.json +++ b/package.json @@ -147,7 +147,7 @@ "language-python": "0.34.0", "language-ruby": "0.52.0", "language-ruby-on-rails": "0.21.0", - "language-sass": "0.36.0", + "language-sass": "0.37.0", "language-shellscript": "0.14.0", "language-source": "0.9.0", "language-sql": "0.15.0", From fc5927a596af05f49ef596882451dbf4f8e6905d Mon Sep 17 00:00:00 2001 From: Jessica Lord Date: Tue, 5 May 2015 16:19:50 -0700 Subject: [PATCH 09/20] :arrow_up: settings-view@0.197.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 585e1b451..5fa296cb4 100644 --- a/package.json +++ b/package.json @@ -111,7 +111,7 @@ "open-on-github": "0.36.0", "package-generator": "0.38.0", "release-notes": "0.52.0", - "settings-view": "0.196.0", + "settings-view": "0.197.0", "snippets": "0.89.0", "spell-check": "0.56.0", "status-bar": "0.69.0", From 8e8e82738806f0aa8b8e0e04b51215181b8a1bc2 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Wed, 6 May 2015 09:34:59 -0700 Subject: [PATCH 10/20] :arrow_up: language-javascript@0.77 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 585e1b451..205b6945a 100644 --- a/package.json +++ b/package.json @@ -135,7 +135,7 @@ "language-html": "0.36.0", "language-hyperlink": "0.13.0", "language-java": "0.15.0", - "language-javascript": "0.76.0", + "language-javascript": "0.77.0", "language-json": "0.14.0", "language-less": "0.27.0", "language-make": "0.14.0", From 61a0927b26a33630875382cec1744c7497a72957 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Wed, 6 May 2015 09:56:32 -0700 Subject: [PATCH 11/20] Use apiPreviewMode value when running specs --- src/browser/atom-application.coffee | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/browser/atom-application.coffee b/src/browser/atom-application.coffee index 178755786..a825b0d34 100644 --- a/src/browser/atom-application.coffee +++ b/src/browser/atom-application.coffee @@ -87,7 +87,7 @@ class AtomApplication openWithOptions: ({pathsToOpen, urlsToOpen, test, pidToKillWhenClosed, devMode, safeMode, apiPreviewMode, newWindow, specDirectory, logFile, profileStartup}) -> if test - @runSpecs({exitWhenDone: true, @resourcePath, specDirectory, logFile}) + @runSpecs({exitWhenDone: true, @resourcePath, specDirectory, logFile, apiPreviewMode}) else if pathsToOpen.length > 0 @openPaths({pathsToOpen, pidToKillWhenClosed, newWindow, devMode, safeMode, apiPreviewMode, profileStartup}) else if urlsToOpen.length > 0 @@ -486,7 +486,7 @@ class AtomApplication # :specPath - The directory to load specs from. # :safeMode - A Boolean that, if true, won't run specs from ~/.atom/packages # and ~/.atom/dev/packages, defaults to false. - runSpecs: ({exitWhenDone, resourcePath, specDirectory, logFile, safeMode}) -> + runSpecs: ({exitWhenDone, resourcePath, specDirectory, logFile, safeMode, apiPreviewMode}) -> if resourcePath isnt @resourcePath and not fs.existsSync(resourcePath) resourcePath = @resourcePath @@ -498,7 +498,8 @@ class AtomApplication isSpec = true devMode = true safeMode ?= false - new AtomWindow({bootstrapScript, resourcePath, exitWhenDone, isSpec, devMode, specDirectory, logFile, safeMode}) + apiPreviewMode ?= false + new AtomWindow({bootstrapScript, resourcePath, exitWhenDone, isSpec, devMode, specDirectory, logFile, safeMode, apiPreviewMode}) runBenchmarks: ({exitWhenDone, specDirectory}={}) -> try From aa1dbf3c5eea00d9cc0eed12dea9545025f9558a Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Wed, 6 May 2015 10:09:55 -0700 Subject: [PATCH 12/20] :arrow_up: apm@0.165 --- apm/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apm/package.json b/apm/package.json index b09eb087a..52f42c0af 100644 --- a/apm/package.json +++ b/apm/package.json @@ -6,6 +6,6 @@ "url": "https://github.com/atom/atom.git" }, "dependencies": { - "atom-package-manager": "0.164.0" + "atom-package-manager": "0.165.0" } } From 11fe07d5d82ecc061bb8872b1388c984fc88bd1d Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Wed, 6 May 2015 10:20:10 -0700 Subject: [PATCH 13/20] :arrow_up: symbols-view@0.96 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 205b6945a..542bd7d37 100644 --- a/package.json +++ b/package.json @@ -116,7 +116,7 @@ "spell-check": "0.56.0", "status-bar": "0.69.0", "styleguide": "0.44.0", - "symbols-view": "0.95.0", + "symbols-view": "0.96.0", "tabs": "0.68.0", "timecop": "0.31.0", "tree-view": "0.171.0", From 75289ee3ddce2406bbd64717f100462ae256da9d Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Wed, 6 May 2015 10:29:34 -0700 Subject: [PATCH 14/20] Fix some integration test flakiness --- spec/integration/helpers/start-atom.coffee | 28 +++++++++++++++------- spec/integration/startup-spec.coffee | 2 ++ 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/spec/integration/helpers/start-atom.coffee b/spec/integration/helpers/start-atom.coffee index 0de6644b3..646281171 100644 --- a/spec/integration/helpers/start-atom.coffee +++ b/spec/integration/helpers/start-atom.coffee @@ -15,15 +15,23 @@ ChromedriverPort = 9515 ChromedriverURLBase = "/wd/hub" ChromedriverStatusURL = "http://localhost:#{ChromedriverPort}#{ChromedriverURLBase}/status" -pollChromeDriver = (done) -> +chromeDriverUp = (done) -> checkStatus = -> - http.get(ChromedriverStatusURL, (response) -> - if response.statusCode is 200 - done() - else - pollChromeDriver(done) - ).on("error", -> pollChromeDriver(done)) + http + .get ChromedriverStatusURL, (response) -> + if response.statusCode is 200 + done() + else + chromeDriverUp(done) + .on("error", -> chromeDriverUp(done)) + setTimeout(checkStatus, 100) +chromeDriverDown = (done) -> + checkStatus = -> + http + .get ChromedriverStatusURL, (response) -> + chromeDriverDown(done) + .on("error", done) setTimeout(checkStatus, 100) buildAtomClient = (args, env) -> @@ -137,9 +145,9 @@ module.exports = (args, env, fn) -> chromedriver.stderr.on "close", -> resolve(errorCode) - waitsFor("webdriver to start", pollChromeDriver, 15000) + waitsFor("webdriver to start", chromeDriverUp, 15000) - waitsFor("webdriver to finish", (done) -> + waitsFor("tests to run", (done) -> finish = once -> client .simulateQuit() @@ -162,3 +170,5 @@ module.exports = (args, env, fn) -> fn(client.init()).then(finish) , 30000) + + waitsFor("webdriver to stop", chromeDriverDown, 15000) diff --git a/spec/integration/startup-spec.coffee b/spec/integration/startup-spec.coffee index b20427954..828193e4d 100644 --- a/spec/integration/startup-spec.coffee +++ b/spec/integration/startup-spec.coffee @@ -150,10 +150,12 @@ describe "Starting Atom", -> .waitForWindowCount(2, 10000) .then ({value: windowHandles}) -> @window(windowHandles[0]) + .waitForExist("atom-workspace") .treeViewRootDirectories() .then ({value: directories}) -> windowProjectPaths.push(directories) .window(windowHandles[1]) + .waitForExist("atom-workspace") .treeViewRootDirectories() .then ({value: directories}) -> windowProjectPaths.push(directories) From 4c2f48792910b5b2026ad468395938f3250c81ed Mon Sep 17 00:00:00 2001 From: Jessica Lord Date: Wed, 6 May 2015 11:55:22 -0700 Subject: [PATCH 15/20] :arrow_up: autocomplete@0.45.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5fa296cb4..74d9a7344 100644 --- a/package.json +++ b/package.json @@ -84,7 +84,7 @@ "solarized-dark-syntax": "0.32.0", "solarized-light-syntax": "0.19.0", "archive-view": "0.56.0", - "autocomplete": "0.44.0", + "autocomplete": "0.45.0", "autoflow": "0.22.0", "autosave": "0.20.0", "background-tips": "0.24.0", From 06844ed60a66748802ca7c58c2f3af1d88190926 Mon Sep 17 00:00:00 2001 From: Ben Ogle Date: Wed, 6 May 2015 13:14:10 -0700 Subject: [PATCH 16/20] :arrow_up: autocomplete@0.46.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 542bd7d37..1b5c01480 100644 --- a/package.json +++ b/package.json @@ -84,7 +84,7 @@ "solarized-dark-syntax": "0.32.0", "solarized-light-syntax": "0.19.0", "archive-view": "0.56.0", - "autocomplete": "0.44.0", + "autocomplete": "0.46.0", "autoflow": "0.22.0", "autosave": "0.20.0", "background-tips": "0.24.0", From 9c34e2273fd4c88fc5882d81f808b35b9782b978 Mon Sep 17 00:00:00 2001 From: Jessica Lord Date: Wed, 6 May 2015 13:14:58 -0700 Subject: [PATCH 17/20] Revert ":arrow_up: autocomplete@0.45.0" This reverts commit 4c2f48792910b5b2026ad468395938f3250c81ed. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 74d9a7344..5fa296cb4 100644 --- a/package.json +++ b/package.json @@ -84,7 +84,7 @@ "solarized-dark-syntax": "0.32.0", "solarized-light-syntax": "0.19.0", "archive-view": "0.56.0", - "autocomplete": "0.45.0", + "autocomplete": "0.44.0", "autoflow": "0.22.0", "autosave": "0.20.0", "background-tips": "0.24.0", From 186448fd530102452dfb627794db2d0b2f6ee0eb Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Wed, 6 May 2015 17:35:53 -0700 Subject: [PATCH 18/20] :arrow_up: notifications --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9d5e66e79..2a43b70c6 100644 --- a/package.json +++ b/package.json @@ -107,7 +107,7 @@ "link": "0.30.0", "markdown-preview": "0.148.0", "metrics": "0.45.0", - "notifications": "0.42.0", + "notifications": "0.43.0", "open-on-github": "0.36.0", "package-generator": "0.38.0", "release-notes": "0.52.0", From b5c130ed18b71de369e5c697231b6f9fc0422c23 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Wed, 6 May 2015 18:02:11 -0700 Subject: [PATCH 19/20] :arrow_up: apm@0.166 --- apm/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apm/package.json b/apm/package.json index 52f42c0af..423e31a12 100644 --- a/apm/package.json +++ b/apm/package.json @@ -6,6 +6,6 @@ "url": "https://github.com/atom/atom.git" }, "dependencies": { - "atom-package-manager": "0.165.0" + "atom-package-manager": "0.166.0" } } From a79a8fa60456a0c41d63c517fdff785b0f4f0a0a Mon Sep 17 00:00:00 2001 From: simurai Date: Thu, 7 May 2015 10:18:41 +0900 Subject: [PATCH 20/20] :arrow_up: one-dark/light-ui@0.8.1 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 2a43b70c6..90e15cfcd 100644 --- a/package.json +++ b/package.json @@ -77,10 +77,10 @@ "atom-light-ui": "0.41.0", "base16-tomorrow-dark-theme": "0.25.0", "base16-tomorrow-light-theme": "0.8.0", - "one-dark-ui": "0.8.0", + "one-dark-ui": "0.8.1", "one-dark-syntax": "0.4.0", "one-light-syntax": "0.5.0", - "one-light-ui": "0.8.0", + "one-light-ui": "0.8.1", "solarized-dark-syntax": "0.32.0", "solarized-light-syntax": "0.19.0", "archive-view": "0.56.0",