github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-25 14:59:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into jl-all-your-normalizes

Browse Source
This commit is contained in:
Jessica Lord
2015-05-07 09:38:02 -07:00
parent 5d7161acd7 a79a8fa604
commit 97aed663fe
6 changed files with 40 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apm/package.json
View File

@@ -6,6 +6,6 @@
"url": "https://github.com/atom/atom.git"
},
"dependencies": {
"atom-package-manager": "0.164.0"
"atom-package-manager": "0.166.0"
}
}

22
package.json
View File

@@ -77,14 +77,14 @@
"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",
"autocomplete": "0.44.0",
"autocomplete": "0.46.0",
"autoflow": "0.22.0",
"autosave": "0.20.0",
"background-tips": "0.24.0",
@@ -107,16 +107,16 @@
"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",
"settings-view": "0.196.0",
"snippets": "0.88.0",
"settings-view": "0.197.0",
"snippets": "0.89.0",
"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",
@@ -128,16 +128,16 @@
"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",
"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.26.0",
"language-less": "0.27.0",
"language-make": "0.14.0",
"language-mustache": "0.11.0",
"language-objective-c": "0.15.0",
@@ -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",

28
spec/integration/helpers/start-atom.coffee
View File

@@ -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)

2
spec/integration/startup-spec.coffee
View File

@@ -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)

13
src/browser/atom-application.coffee
View File

@@ -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
@@ -518,11 +519,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}

3
src/config-schema.coffee
View File

@@ -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: ''