github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-26 15:28:27 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:atom/atom into content-regex

Browse Source
This commit is contained in:
Aerijo
2019-02-07 11:40:55 +10:00
parent 9ea7903b43 a99b5270a8
commit cda052fa64
15 changed files with 292 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@@ -15,7 +15,7 @@ matrix:
include:
- os: linux
dist: trusty
env: NODE_VERSION=8.9.3 DISPLAY=:99.0 CC=clang CXX=clang++ npm_config_clang=1
env: NODE_VERSION=8.9.3 DISPLAY=:99.0 CC=clang CXX=clang++ npm_config_clang=1 ATOM_JASMINE_REPORTER=list
sudo: required

1
appveyor.yml
View File

@@ -19,6 +19,7 @@ platform:
environment:
global:
ATOM_DEV_RESOURCE_PATH: c:\projects\atom
ATOM_JASMINE_REPORTER: list
TEST_JUNIT_XML_ROOT: c:\projects\junit-test-results
NODE_VERSION: 8.9.3

277
package-lock.json generated
View File

@@ -5,9 +5,9 @@
"requires": true,
"dependencies": {
"@atom/nsfw": {
"version": "1.0.20",
"resolved": "https://registry.npmjs.org/@atom/nsfw/-/nsfw-1.0.20.tgz",
"integrity": "sha512-g/7g0xeqoqhnpb28GZr0I6h8q6sKzS83ic+e+40cD5GoEx8Gpo2MzlvrHvrkONGxckxnSmtcIGlon7YoT/UV3Q==",
"version": "1.0.21",
"resolved": "https://registry.npmjs.org/@atom/nsfw/-/nsfw-1.0.21.tgz",
"integrity": "sha512-ERz76RZstjDvZPM4FHwgO+9dzGkki0mJsn2r+Mu4yn29MzUuAtSmtyJDPmupVUvmz2PF7KvRbC/W2A8A6BHQhA==",
"requires": {
"fs-extra": "^7.0.0",
"lodash.isinteger": "^4.0.4",
@@ -651,6 +651,15 @@
"resolved": "https://registry.npmjs.org/babel-plugin-jscript/-/babel-plugin-jscript-1.0.4.tgz",
"integrity": "sha1-jzQsOCduh6R9X6CovT1etsytj8w="
},
"babel-plugin-macros": {
"version": "2.4.5",
"resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-2.4.5.tgz",
"integrity": "sha512-+/9yteNQw3yuZ3krQUfjAeoT/f4EAdn3ELwhFfDj0rTMIaoHfIdrcLePOfIaL0qmFLpIcgPIL2Lzm58h+CGWaw==",
"requires": {
"cosmiconfig": "^5.0.5",
"resolve": "^1.8.1"
}
},
"babel-plugin-member-expression-literals": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/babel-plugin-member-expression-literals/-/babel-plugin-member-expression-literals-1.0.1.tgz",
@@ -680,10 +689,11 @@
"integrity": "sha1-dU/jiSboQkpOexWrbqYTne4FFPw="
},
"babel-plugin-relay": {
"version": "1.6.0",
"resolved": "https://registry.npmjs.org/babel-plugin-relay/-/babel-plugin-relay-1.6.0.tgz",
"integrity": "sha512-C7ylRxOCw04pXMxuGZ16mBBol36VQTMdbnWolB9YdQWIygf0nEQuNUS8OW/IQxTaHj7Q87uJ94POXCNFDnuT0w==",
"version": "1.7.0",
"resolved": "https://registry.npmjs.org/babel-plugin-relay/-/babel-plugin-relay-1.7.0.tgz",
"integrity": "sha512-4kDgElsQ3+m1YHGinm2CWu55XzpPqEzf42JuYWUAJWvTBcHkd/VGVftO9C6BjnssUU7fDH9izn3qMtp0XFWGKw==",
"requires": {
"babel-plugin-macros": "^2.0.0",
"babel-runtime": "^6.23.0",
"babel-types": "^6.24.1"
}
@@ -888,9 +898,9 @@
"integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ=="
},
"core-js": {
"version": "2.6.1",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.1.tgz",
"integrity": "sha512-L72mmmEayPJBejKIWe2pYtGis5r0tQ5NaJekdhyXgeMQTpJoBsH0NL4ElY2LfSoV15xeQWKQ+XTTOZdyero5Xg=="
"version": "2.6.3",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.3.tgz",
"integrity": "sha512-l00tmFFZOBHtYhN4Cz7k32VM7vTn3rE2ANjQDxdEN6zmXZ/xq1jQuutnmHvMG1ZJ7xd72+TA5YpUK8wz3rWsfQ=="
},
"home-or-tmp": {
"version": "2.0.0",
@@ -936,9 +946,9 @@
},
"dependencies": {
"core-js": {
"version": "2.6.1",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.1.tgz",
"integrity": "sha512-L72mmmEayPJBejKIWe2pYtGis5r0tQ5NaJekdhyXgeMQTpJoBsH0NL4ElY2LfSoV15xeQWKQ+XTTOZdyero5Xg=="
"version": "2.6.3",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.3.tgz",
"integrity": "sha512-l00tmFFZOBHtYhN4Cz7k32VM7vTn3rE2ANjQDxdEN6zmXZ/xq1jQuutnmHvMG1ZJ7xd72+TA5YpUK8wz3rWsfQ=="
}
}
},
@@ -1059,6 +1069,11 @@
"resolved": "https://registry.npmjs.org/binary-search/-/binary-search-1.3.4.tgz",
"integrity": "sha512-dPxU/vZLnH0tEVjVPgi015oSwqu6oLfCeHywuFRhBE0yM0mYocvleTl8qsdM1YFhRzTRhM1+VzS8XLDVrHPopg=="
},
"bintrees": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/bintrees/-/bintrees-1.0.2.tgz",
"integrity": "sha1-SfiW1uhYpKSZ34XDj7OZua/4QPg="
},
"bl": {
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz",
@@ -1157,6 +1172,27 @@
"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
"integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg="
},
"caller-callsite": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz",
"integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=",
"requires": {
"callsites": "^2.0.0"
}
},
"caller-path": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz",
"integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=",
"requires": {
"caller-callsite": "^2.0.0"
}
},
"callsites": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
"integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA="
},
"camelcase": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
@@ -1512,6 +1548,33 @@
"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
},
"cosmiconfig": {
"version": "5.0.7",
"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.0.7.tgz",
"integrity": "sha512-PcLqxTKiDmNT6pSpy4N6KtuPwb53W+2tzNvwOZw0WH9N6O0vLIBq0x8aj8Oj75ere4YcGi48bDFCL+3fRJdlNA==",
"requires": {
"import-fresh": "^2.0.0",
"is-directory": "^0.3.1",
"js-yaml": "^3.9.0",
"parse-json": "^4.0.0"
},
"dependencies": {
"esprima": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
},
"js-yaml": {
"version": "3.12.1",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.1.tgz",
"integrity": "sha512-um46hB9wNOKlwkHgiuyEVAybXBjwFUV0Z/RaHJblRd9DXltue9FTYvzCr9ErQrK9Adz5MU4gHWVaNUfdmrC8qA==",
"requires": {
"argparse": "^1.0.7",
"esprima": "^4.0.0"
}
}
}
},
"crypt": {
"version": "0.0.2",
"resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz",
@@ -1822,9 +1885,9 @@
}
},
"dugite": {
"version": "1.81.0",
"resolved": "https://registry.npmjs.org/dugite/-/dugite-1.81.0.tgz",
"integrity": "sha512-aH1cVzbEXOHqpiub9PWJUN+R2p7H+tvN+VqyAYHR9Tj/axLDccWJk5aKDN1/US82DkaIYWUZz8x0lAbjfqrq4Q==",
"version": "1.82.0",
"resolved": "https://registry.npmjs.org/dugite/-/dugite-1.82.0.tgz",
"integrity": "sha512-/mfn8DEvlVRTHmoWKZcscwE9aTBxTo6z13WU2F+9ZT7cfc/kBHVnsag0bdqQkFmYv24bjEVaNqQ+DkyMbqVxrw==",
"requires": {
"checksum": "^0.1.1",
"mkdirp": "^0.5.1",
@@ -1940,6 +2003,14 @@
"prr": "~1.0.1"
}
},
"error-ex": {
"version": "1.3.2",
"resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
"integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
"requires": {
"is-arrayish": "^0.2.1"
}
},
"es5-ext": {
"version": "0.10.45",
"resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.45.tgz",
@@ -2487,35 +2558,36 @@
}
},
"github": {
"version": "https://www.atom.io/api/packages/github/versions/0.24.0/tarball",
"integrity": "sha512-STupVetbztFBB+eGnzUyuX1jbeRL9z9vkkf3t1zbi0+8zr82NDWhSRlyojYyJ0vsT0BbqYxDeKWYl4kQySOfdg==",
"version": "https://www.atom.io/api/packages/github/versions/0.26.0/tarball",
"integrity": "sha512-mFnhhP6F4QR2cSU7COTii6S4YWyUDsXuW+ympa8eg7FJA68lsdvkSBKkwZtn8qXRQ2aVRMZsn4l90MTgIjIdEA==",
"requires": {
"atom-babel6-transpiler": "1.2.0",
"babel-generator": "6.26.1",
"babel-plugin-chai-assert-async": "0.1.0",
"babel-plugin-relay": "1.6.0",
"babel-plugin-relay": "1.7.0",
"babel-plugin-transform-class-properties": "6.24.1",
"babel-plugin-transform-es2015-modules-commonjs": "6.26.2",
"babel-plugin-transform-object-rest-spread": "6.26.0",
"babel-preset-react": "6.24.1",
"bintrees": "1.0.2",
"bytes": "^3.0.0",
"classnames": "2.2.6",
"compare-sets": "1.0.1",
"dugite": "^1.79.0",
"dugite": "^1.81.0",
"event-kit": "2.5.3",
"fs-extra": "4.0.3",
"graphql": "0.13.2",
"keytar": "4.2.1",
"keytar": "4.3.0",
"lodash.memoize": "4.1.2",
"moment": "2.22.2",
"moment": "2.23.0",
"node-emoji": "^1.8.1",
"prop-types": "15.6.2",
"react": "16.4.0",
"react-dom": "16.4.0",
"react-relay": "1.6.0",
"react": "16.7.0",
"react-dom": "16.7.0",
"react-relay": "1.7.0",
"react-select": "1.2.1",
"react-tabs": "^2.3.0",
"relay-runtime": "1.6.0",
"react-tabs": "^3.0.0",
"relay-runtime": "1.7.0",
"temp": "0.9.0",
"tinycolor2": "1.4.1",
"tree-kill": "1.2.1",
@@ -2535,6 +2607,11 @@
"universalify": "^0.1.0"
}
},
"moment": {
"version": "2.23.0",
"resolved": "https://registry.npmjs.org/moment/-/moment-2.23.0.tgz",
"integrity": "sha512-3IE39bHVqFbWWaPOMHZF98Q9c3LDKGTmypMiTM2QygGXXElkFWIH7GxfmlwmY2vwa+wmNsoYZmG2iusf1ZjJoA=="
},
"temp": {
"version": "0.9.0",
"resolved": "https://registry.npmjs.org/temp/-/temp-0.9.0.tgz",
@@ -2589,7 +2666,7 @@
},
"graphql": {
"version": "0.13.2",
"resolved": "http://registry.npmjs.org/graphql/-/graphql-0.13.2.tgz",
"resolved": "https://registry.npmjs.org/graphql/-/graphql-0.13.2.tgz",
"integrity": "sha512-QZ5BL8ZO/B20VA8APauGBg3GyEgZ19eduvpLWoq5x7gMmWnHoy8rlQWPLmWgFvo1yNgjSEFMesmS4R6pPr7xog==",
"requires": {
"iterall": "^1.2.1"
@@ -2778,6 +2855,15 @@
}
}
},
"import-fresh": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
"integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=",
"requires": {
"caller-path": "^2.0.0",
"resolve-from": "^3.0.0"
}
},
"incompatible-packages": {
"version": "file:packages/incompatible-packages",
"requires": {
@@ -2821,6 +2907,11 @@
"resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
"integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY="
},
"is-arrayish": {
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
"integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
},
"is-buffer": {
"version": "1.1.6",
"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
@@ -2834,6 +2925,11 @@
"builtin-modules": "^1.0.0"
}
},
"is-directory": {
"version": "0.3.1",
"resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
"integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE="
},
"is-finite": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
@@ -3019,6 +3115,11 @@
"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
"integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0="
},
"json-parse-better-errors": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
"integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="
},
"json-schema": {
"version": "0.2.3",
"resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
@@ -3109,12 +3210,12 @@
}
},
"keytar": {
"version": "4.2.1",
"resolved": "https://registry.npmjs.org/keytar/-/keytar-4.2.1.tgz",
"integrity": "sha1-igamV3/fY3PgqmsRInfmPex3/RI=",
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/keytar/-/keytar-4.3.0.tgz",
"integrity": "sha512-pd++/v+fS0LQKmzWlW6R1lziTXFqhfGeS6sYLfuTIqEy2pDzAbjutbSW8f9tnJdEEMn/9XhAQlT34VAtl9h4MQ==",
"requires": {
"nan": "2.8.0",
"prebuild-install": "^2.4.1"
"prebuild-install": "^5.0.0"
},
"dependencies": {
"nan": {
@@ -3233,11 +3334,11 @@
"integrity": "sha512-HD6HI41u57i0/Tu9catiriURhJsef0RDrzJDkGDtdFkE9F9KPxC9Fayq2JBLJrhIyADRVXFxwxsfwQ2Jmh6hxg=="
},
"language-python": {
"version": "https://www.atom.io/api/packages/language-python/versions/0.51.8/tarball",
"integrity": "sha512-Q7KlaVoZhWftIS545wWHIAhUKOc4YFhHjR8PZzvM++awdELbpvr7q8WQRMO6aBBeyhd6vSUkDWopANhmJ95VRg==",
"version": "https://www.atom.io/api/packages/language-python/versions/0.51.9/tarball",
"integrity": "sha512-lzGnQWARAoojTmM5q9JONDkufjbt+XGOOrTe0vOFByyVdZpqcMzsS0bzhzkBJ3GHnAOp0W5DB0idwfwNtuAsag==",
"requires": {
"atom-grammar-test": "^0.6.4",
"tree-sitter-python": "^0.13.4"
"tree-sitter-python": "^0.13.6"
}
},
"language-ruby": {
@@ -4226,6 +4327,15 @@
"underscore-plus": "^1.0.0"
}
},
"parse-json": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
"integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
"requires": {
"error-ex": "^1.3.1",
"json-parse-better-errors": "^1.0.1"
}
},
"path-exists": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-1.0.0.tgz",
@@ -4331,31 +4441,50 @@
}
},
"prebuild-install": {
"version": "2.5.3",
"resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-2.5.3.tgz",
"integrity": "sha512-/rI36cN2g7vDQnKWN8Uzupi++KjyqS9iS+/fpwG4Ea8d0Pip0PQ5bshUNzVwt+/D2MRfhVAplYMMvWLqWrCF/g==",
"version": "5.2.4",
"resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.2.4.tgz",
"integrity": "sha512-CG3JnpTZXdmr92GW4zbcba4jkDha6uHraJ7hW4Fn8j0mExxwOKK20hqho8ZuBDCKYCHYIkFM1P2jhtG+KpP4fg==",
"requires": {
"detect-libc": "^1.0.3",
"expand-template": "^1.0.2",
"expand-template": "^2.0.3",
"github-from-package": "0.0.0",
"minimist": "^1.2.0",
"mkdirp": "^0.5.1",
"node-abi": "^2.2.0",
"napi-build-utils": "^1.0.1",
"node-abi": "^2.7.0",
"noop-logger": "^0.1.1",
"npmlog": "^4.0.1",
"os-homedir": "^1.0.1",
"pump": "^2.0.1",
"rc": "^1.1.6",
"rc": "^1.2.7",
"simple-get": "^2.7.0",
"tar-fs": "^1.13.0",
"tunnel-agent": "^0.6.0",
"which-pm-runs": "^1.0.0"
},
"dependencies": {
"expand-template": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
"integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg=="
},
"minimist": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
},
"node-abi": {
"version": "2.7.0",
"resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.7.0.tgz",
"integrity": "sha512-egTtvNoZLMjwxkL/5iiJKYKZgn2im0zP+G+PncMxICYGiD3aZtXUvEsDmu0pF8gpASvLZyD8v53qi1/ELaRZpg==",
"requires": {
"semver": "^5.4.1"
}
},
"semver": {
"version": "5.6.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
"integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg=="
}
}
},
@@ -4473,25 +4602,25 @@
}
},
"react": {
"version": "16.4.0",
"resolved": "https://registry.npmjs.org/react/-/react-16.4.0.tgz",
"integrity": "sha512-K0UrkLXSAekf5nJu89obKUM7o2vc6MMN9LYoKnCa+c+8MJRAT120xzPLENcWSRc7GYKIg0LlgJRDorrufdglQQ==",
"version": "16.7.0",
"resolved": "https://registry.npmjs.org/react/-/react-16.7.0.tgz",
"integrity": "sha512-StCz3QY8lxTb5cl2HJxjwLFOXPIFQp+p+hxQfc8WE0QiLfCtIlKj8/+5tjjKm8uSTlAW+fCPaavGFS06V9Ar3A==",
"requires": {
"fbjs": "^0.8.16",
"loose-envify": "^1.1.0",
"object-assign": "^4.1.1",
"prop-types": "^15.6.0"
"prop-types": "^15.6.2",
"scheduler": "^0.12.0"
}
},
"react-dom": {
"version": "16.4.0",
"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.4.0.tgz",
"integrity": "sha512-bbLd+HYpBEnYoNyxDe9XpSG2t9wypMohwQPvKw8Hov3nF7SJiJIgK56b46zHpBUpHb06a1iEuw7G3rbrsnNL6w==",
"version": "16.7.0",
"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.7.0.tgz",
"integrity": "sha512-D0Ufv1ExCAmF38P2Uh1lwpminZFRXEINJe53zRAbm4KPwSyd6DY/uDoS0Blj9jvPpn1+wivKpZYc8aAAN/nAkg==",
"requires": {
"fbjs": "^0.8.16",
"loose-envify": "^1.1.0",
"object-assign": "^4.1.1",
"prop-types": "^15.6.0"
"prop-types": "^15.6.2",
"scheduler": "^0.12.0"
}
},
"react-input-autosize": {
@@ -4503,14 +4632,14 @@
}
},
"react-relay": {
"version": "1.6.0",
"resolved": "https://registry.npmjs.org/react-relay/-/react-relay-1.6.0.tgz",
"integrity": "sha512-8clmRHXNo96pcdkA8ZeiqF7xGjE+mjSbdX/INj5upRm2M8AprSrFk2Oz5nH084O+0hvXQhZtFyraXJWQO9ld3A==",
"version": "1.7.0",
"resolved": "https://registry.npmjs.org/react-relay/-/react-relay-1.7.0.tgz",
"integrity": "sha512-vZOs1iK6LxqeaAelwSuD5eVXnQux5eVIrik/kxKt6Y3j6ylrjrdTadmgO6sapGc0TG61VtFK5CKPOtW+XSNotg==",
"requires": {
"babel-runtime": "^6.23.0",
"fbjs": "^0.8.14",
"fbjs": "0.8.17",
"prop-types": "^15.5.8",
"relay-runtime": "1.6.0"
"relay-runtime": "1.7.0"
}
},
"react-select": {
@@ -4524,9 +4653,9 @@
}
},
"react-tabs": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/react-tabs/-/react-tabs-2.3.0.tgz",
"integrity": "sha512-pYaefgVy76/36AMEP+B8YuVVzDHa3C5UFZ3REU78zolk0qMxEhKvUFofvDCXyLZwf0RZjxIfiwok1BEb18nHyA==",
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/react-tabs/-/react-tabs-3.0.0.tgz",
"integrity": "sha512-z90cDIb+5V7MzjXFHq1VLxYiMH7dDQWan7mXSw6BWQtw+9pYAnq/fEDvsPaXNyevYitvLetdW87C61uu27JVMA==",
"requires": {
"classnames": "^2.2.0",
"prop-types": "^15.5.0"
@@ -4625,12 +4754,12 @@
}
},
"relay-runtime": {
"version": "1.6.0",
"resolved": "https://registry.npmjs.org/relay-runtime/-/relay-runtime-1.6.0.tgz",
"integrity": "sha512-UJiEHp8CX2uFxXdM0nVLTCQ6yAT0GLmyMceXLISuW/l2a9jrS9a4MdZgdr/9UkkYno7Sj1hU/EUIQ0GaVkou8g==",
"version": "1.7.0",
"resolved": "https://registry.npmjs.org/relay-runtime/-/relay-runtime-1.7.0.tgz",
"integrity": "sha512-gvx01aRoLHdIMQoIjMQ79js4BR9JZVfF/SoSiLXvWOgDWEnD7RKb80zmCZTByCpka0GwFzkVwBWUy1gW6g0zlQ==",
"requires": {
"babel-runtime": "^6.23.0",
"fbjs": "^0.8.14"
"fbjs": "0.8.17"
}
},
"repeat-string": {
@@ -4730,6 +4859,11 @@
"path-parse": "^1.0.5"
}
},
"resolve-from": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
"integrity": "sha1-six699nWiBvItuZTM17rywoYh0g="
},
"rfdc": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.1.2.tgz",
@@ -4814,6 +4948,15 @@
}
}
},
"scheduler": {
"version": "0.12.0",
"resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.12.0.tgz",
"integrity": "sha512-t7MBR28Akcp4Jm+QoR63XgAi9YgCUmgvDHqf5otgAj4QvdoBE4ImCX0ffehefePPG+aitiYHp0g/mW6s4Tp+dw==",
"requires": {
"loose-envify": "^1.1.0",
"object-assign": "^4.1.1"
}
},
"scoped-property-store": {
"version": "0.17.0",
"resolved": "https://registry.npmjs.org/scoped-property-store/-/scoped-property-store-0.17.0.tgz",
@@ -4928,8 +5071,8 @@
"integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU="
},
"settings-view": {
"version": "https://www.atom.io/api/packages/settings-view/versions/0.258.0/tarball",
"integrity": "sha512-X2avkVC51tM8yGxyQDXF9DZUbxTOhuJPZbgZJaXkebo+Yj/aq4AUkc+AQFOHzWs+PWctyIzCem4PyRq8XIoQ+A==",
"version": "https://www.atom.io/api/packages/settings-view/versions/0.259.0/tarball",
"integrity": "sha512-jNQuTozGf1uQtS4Y4hlUT15STnmnKlAWzzJOIe+ts2S/SdrGHZwxhNykJFzM8gC8j4N3Kjb8CkgmbCDzZ98aEw==",
"requires": {
"async": "~0.2.9",
"dompurify": "^1.0.2",
@@ -5704,9 +5847,9 @@
}
},
"tree-sitter-python": {
"version": "0.13.5",
"resolved": "https://registry.npmjs.org/tree-sitter-python/-/tree-sitter-python-0.13.5.tgz",
"integrity": "sha512-mkGw5cSDvAiyB1dLFPw98oKN5RXCc9WKYDwRAY9KXul+OpPgkDn3ZmuZLtWiFUvBVtrXBHVDnfM5IV88Boozjg==",
"version": "0.13.6",
"resolved": "https://registry.npmjs.org/tree-sitter-python/-/tree-sitter-python-0.13.6.tgz",
"integrity": "sha512-QGc7dNObFv5+kCIvknO+Jv9eHusgamlcxZpLkDioAK6/dZ/f+3vbn3KQ2y4PpS1qiAHaaxh2V4XgMyv6k/rS9g==",
"requires": {
"nan": "^2.4.0"
}

14
package.json
View File

@@ -14,7 +14,7 @@
"license": "MIT",
"electronVersion": "3.0.14",
"dependencies": {
"@atom/nsfw": "^1.0.20",
"@atom/nsfw": "1.0.21",
"@atom/source-map-support": "^0.3.4",
"@atom/watcher": "1.0.8",
"about": "file:packages/about",
@@ -65,7 +65,7 @@
"fuzzy-finder": "https://www.atom.io/api/packages/fuzzy-finder/versions/1.9.0/tarball",
"git-diff": "file:packages/git-diff",
"git-utils": "5.2.1",
"github": "https://www.atom.io/api/packages/github/versions/0.24.0/tarball",
"github": "https://www.atom.io/api/packages/github/versions/0.26.0/tarball",
"glob": "^7.1.1",
"go-to-line": "file:packages/go-to-line",
"grammar-selector": "file:packages/grammar-selector",
@@ -97,7 +97,7 @@
"language-perl": "https://www.atom.io/api/packages/language-perl/versions/0.38.1/tarball",
"language-php": "https://www.atom.io/api/packages/language-php/versions/0.44.1/tarball",
"language-property-list": "https://www.atom.io/api/packages/language-property-list/versions/0.9.1/tarball",
"language-python": "https://www.atom.io/api/packages/language-python/versions/0.51.8/tarball",
"language-python": "https://www.atom.io/api/packages/language-python/versions/0.51.9/tarball",
"language-ruby": "https://www.atom.io/api/packages/language-ruby/versions/0.72.15/tarball",
"language-ruby-on-rails": "https://www.atom.io/api/packages/language-ruby-on-rails/versions/0.25.3/tarball",
"language-rust-bundled": "file:packages/language-rust-bundled",
@@ -144,7 +144,7 @@
"season": "^6.0.2",
"semver": "^4.3.3",
"service-hub": "^0.7.4",
"settings-view": "https://www.atom.io/api/packages/settings-view/versions/0.258.0/tarball",
"settings-view": "https://www.atom.io/api/packages/settings-view/versions/0.259.0/tarball",
"sinon": "1.17.4",
"snippets": "https://www.atom.io/api/packages/snippets/versions/1.4.0/tarball",
"solarized-dark-syntax": "file:packages/solarized-dark-syntax",
@@ -202,7 +202,7 @@
"exception-reporting": "file:./packages/exception-reporting",
"find-and-replace": "0.218.0",
"fuzzy-finder": "1.9.0",
"github": "0.24.0",
"github": "0.26.0",
"git-diff": "file:./packages/git-diff",
"go-to-line": "file:./packages/go-to-line",
"grammar-selector": "file:./packages/grammar-selector",
@@ -216,7 +216,7 @@
"notifications": "0.70.6",
"open-on-github": "1.3.1",
"package-generator": "1.3.0",
"settings-view": "0.258.0",
"settings-view": "0.259.0",
"snippets": "1.4.0",
"spell-check": "0.74.3",
"status-bar": "1.8.17",
@@ -249,7 +249,7 @@
"language-perl": "0.38.1",
"language-php": "0.44.1",
"language-property-list": "0.9.1",
"language-python": "0.51.8",
"language-python": "0.51.9",
"language-ruby": "0.72.15",
"language-ruby-on-rails": "0.25.3",
"language-rust-bundled": "file:./packages/language-rust-bundled",

7
packages/one-dark-ui/styles/settings.less
View File

@@ -55,9 +55,6 @@
.section-container {
max-width: @ui-size*60;
}
.sub-section {
margin: @ui-padding*3 0;
}
.section,
.section:first-child,
@@ -85,6 +82,10 @@
// Cards ------------------------------
.sub-section:not(.collapsed) .package-container {
padding-bottom: @component-padding*3;
}
.package-card {
padding: @ui-padding;
.meta-controls .status-indicator {

7
packages/one-light-ui/styles/settings.less
View File

@@ -55,9 +55,6 @@
.section-container {
max-width: @ui-size*60;
}
.sub-section {
margin: @ui-padding*3 0;
}
.section,
.section:first-child,
@@ -85,6 +82,10 @@
// Cards ------------------------------
.sub-section:not(.collapsed) .package-container {
padding-bottom: @component-padding*3;
}
.package-card {
padding: @ui-padding;
.meta-controls .status-indicator {

18
script/package-lock.json generated
View File

@@ -1754,9 +1754,9 @@
}
},
"electron-link": {
"version": "0.3.2",
"resolved": "https://registry.npmjs.org/electron-link/-/electron-link-0.3.2.tgz",
"integrity": "sha512-V7QmtujzWgvrW5BI2CKmIRF+q+pkrFO5Lecd8TpibbBz+FfW5WQ4kCN0sZjNaUOMtGGroCib721OqIDEynjwgA==",
"version": "0.3.3",
"resolved": "https://registry.npmjs.org/electron-link/-/electron-link-0.3.3.tgz",
"integrity": "sha512-dxFY3o3E9kBkOyfaY66PWabK1AL5Re8qmy2Abz2/VhVkp2KtvUn6BZODTm9XpC0REgWxlQfRyHlNTlXRBPrWCQ==",
"requires": {
"ast-util": "^0.6.0",
"encoding-down": "~5.0.0",
@@ -1774,9 +1774,9 @@
"integrity": "sha512-UY7+9DPzlJ9VM8eY0b2TUZcZvF+1pO0hzMtAyjBYKhOmnvRlqYNYnWdtsMj0V16CGaMlpL0G1jnLbLo4AyotuQ=="
},
"core-js": {
"version": "2.6.1",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.1.tgz",
"integrity": "sha512-L72mmmEayPJBejKIWe2pYtGis5r0tQ5NaJekdhyXgeMQTpJoBsH0NL4ElY2LfSoV15xeQWKQ+XTTOZdyero5Xg=="
"version": "2.6.3",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.3.tgz",
"integrity": "sha512-l00tmFFZOBHtYhN4Cz7k32VM7vTn3rE2ANjQDxdEN6zmXZ/xq1jQuutnmHvMG1ZJ7xd72+TA5YpUK8wz3rWsfQ=="
},
"esprima": {
"version": "4.0.1",
@@ -4746,9 +4746,9 @@
"integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw="
},
"node-abi": {
"version": "2.5.1",
"resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.5.1.tgz",
"integrity": "sha512-oDbFc7vCFx0RWWCweTer3hFm1u+e60N5FtGnmRV6QqvgATGFH/XRR6vqWIeBVosCYCqt6YdIr2L0exLZuEdVcQ==",
"version": "2.7.0",
"resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.7.0.tgz",
"integrity": "sha512-egTtvNoZLMjwxkL/5iiJKYKZgn2im0zP+G+PncMxICYGiD3aZtXUvEsDmu0pF8gpASvLZyD8v53qi1/ELaRZpg==",
"requires": {
"semver": "^5.4.1"
},

2
script/package.json
View File

@@ -10,7 +10,7 @@
"colors": "1.1.2",
"donna": "1.0.16",
"electron-chromedriver": "~3.0.0-beta.1",
"electron-link": "0.3.2",
"electron-link": "0.3.3",
"electron-mksnapshot": "~3.0.10",
"electron-packager": "7.3.0",
"electron-winstaller": "2.6.4",

1
script/vsts/platforms/linux.yml
View File

@@ -24,6 +24,7 @@ jobs:
env:
CI: true
CI_PROVIDER: VSTS
ATOM_JASMINE_REPORTER: list
displayName: Run tests
condition: and(succeeded(), ne(variables['Atom.SkipTests'], 'true'))

1
script/vsts/platforms/macos.yml
View File

@@ -44,6 +44,7 @@ jobs:
env:
CI: true
CI_PROVIDER: VSTS
ATOM_JASMINE_REPORTER: list
displayName: Run tests
condition: and(succeeded(), ne(variables['Atom.SkipTests'], 'true'))

1
script/vsts/platforms/windows.yml
View File

@@ -69,6 +69,7 @@ jobs:
env:
CI: true
CI_PROVIDER: VSTS
ATOM_JASMINE_REPORTER: list
BUILD_ARCH: $(buildArch)
displayName: Run tests
condition: and(succeeded(), ne(variables['Atom.SkipTests'], 'true'))

35
spec/jasmine-list-reporter.js Normal file
View File

@@ -0,0 +1,35 @@
const {TerminalReporter} = require('jasmine-tagged')
class JasmineListReporter extends TerminalReporter {
fullDescription (spec) {
let fullDescription = spec.description
let currentSuite = spec.suite
while (currentSuite) {
fullDescription = currentSuite.description + ' > ' + fullDescription
currentSuite = currentSuite.parentSuite
}
return fullDescription
}
reportSpecStarting (spec) {
this.print_(this.fullDescription(spec) + ' ')
}
reportSpecResults (spec) {
const result = spec.results()
if (result.skipped) {
return
}
let msg = ''
if (result.passed()) {
msg = this.stringWithColor_('[pass]', this.color_.pass())
} else {
msg = this.stringWithColor_('[FAIL]', this.color_.fail())
this.addFailureToFailures_(spec)
}
this.printLine_(msg)
}
}
module.exports = { JasmineListReporter }

17
spec/jasmine-test-runner.coffee
View File

@@ -1,8 +1,11 @@
Grim = require 'grim'
fs = require 'fs-plus'
temp = require 'temp'
path = require 'path'
{ipcRenderer} = require 'electron'
temp.track()
module.exports = ({logFile, headless, testPaths, buildAtomEnvironment}) ->
window[key] = value for key, value of require '../vendor/jasmine'
require 'jasmine-tagged'
@@ -17,13 +20,15 @@ module.exports = ({logFile, headless, testPaths, buildAtomEnvironment}) ->
get: -> documentTitle
set: (title) -> documentTitle = title
atomHome = temp.mkdirSync prefix: 'atom-test-home-'
ApplicationDelegate = require '../src/application-delegate'
applicationDelegate = new ApplicationDelegate()
applicationDelegate.setRepresentedFilename = ->
applicationDelegate.setWindowDocumentEdited = ->
window.atom = buildAtomEnvironment({
applicationDelegate, window, document,
configDirPath: process.env.ATOM_HOME
configDirPath: atomHome
enablePersistence: false
})
@@ -94,8 +99,7 @@ buildTerminalReporter = (logFile, resolveWithExitCode) ->
else
ipcRenderer.send 'write-to-stderr', str
{TerminalReporter} = require 'jasmine-tagged'
new TerminalReporter
options =
print: (str) ->
log(str)
onComplete: (runner) ->
@@ -109,3 +113,10 @@ buildTerminalReporter = (logFile, resolveWithExitCode) ->
resolveWithExitCode(1)
else
resolveWithExitCode(0)
if process.env.ATOM_JASMINE_REPORTER is 'list'
{JasmineListReporter} = require './jasmine-list-reporter'
new JasmineListReporter(options)
else
{TerminalReporter} = require 'jasmine-tagged'
new TerminalReporter(options)

2
src/main-process/atom-application.js
View File

@@ -91,6 +91,7 @@ class AtomApplication extends EventEmitter {
constructor (options) {
super()
this.quitting = false
this.quittingForUpdate = false
this.getAllWindows = this.getAllWindows.bind(this)
this.getLastFocusedWindow = this.getLastFocusedWindow.bind(this)
this.resourcePath = options.resourcePath
@@ -384,6 +385,7 @@ class AtomApplication extends EventEmitter {
this.on('application:install-update', () => {
this.quitting = true
this.quittingForUpdate = true
this.autoUpdateManager.install()
})

2
src/main-process/atom-window.js
View File

@@ -148,7 +148,7 @@ class AtomWindow extends EventEmitter {
handleEvents () {
this.browserWindow.on('close', async event => {
if (!this.atomApplication.quitting && !this.unloading) {
if ((!this.atomApplication.quitting || this.atomApplication.quittingForUpdate) && !this.unloading) {
event.preventDefault()
this.unloading = true
this.atomApplication.saveCurrentWindowOptions(false)