mirror of
https://github.com/pulsar-edit/pulsar.git
synced 2024-09-11 19:17:09 +03:00
Merge branch 'master' into atom-shell
Conflicts: .gitmodules
This commit is contained in:
commit
2bd95a2b57
84
.gitmodules
vendored
84
.gitmodules
vendored
@ -1,90 +1,6 @@
|
||||
[submodule "vendor/packages/text.tmbundle"]
|
||||
path = vendor/packages/text.tmbundle
|
||||
url = https://github.com/textmate/text.tmbundle.git
|
||||
[submodule "vendor/packages/css.tmbundle"]
|
||||
path = vendor/packages/css.tmbundle
|
||||
url = https://github.com/textmate/css.tmbundle.git
|
||||
[submodule "vendor/packages/html.tmbundle"]
|
||||
path = vendor/packages/html.tmbundle
|
||||
url = https://github.com/textmate/html.tmbundle.git
|
||||
[submodule "vendor/packages/javascript.tmbundle"]
|
||||
path = vendor/packages/javascript.tmbundle
|
||||
url = https://github.com/textmate/javascript.tmbundle.git
|
||||
[submodule "vendor/packages/ruby-on-rails-tmbundle"]
|
||||
path = vendor/packages/ruby-on-rails-tmbundle
|
||||
url = https://github.com/drnic/ruby-on-rails-tmbundle.git
|
||||
[submodule "vendor/packages/ruby.tmbundle"]
|
||||
path = vendor/packages/ruby.tmbundle
|
||||
url = https://github.com/textmate/ruby.tmbundle.git
|
||||
[submodule "vendor/packages/coffee-script-tmbundle"]
|
||||
path = vendor/packages/coffee-script-tmbundle
|
||||
url = https://github.com/kevinsawicki/coffee-script-tmbundle.git
|
||||
[submodule "vendor/packages/puppet-textmate.tmbundle"]
|
||||
path = vendor/packages/puppet-textmate.tmbundle
|
||||
url = https://github.com/cburyta/puppet-textmate.tmbundle.git
|
||||
[submodule "vendor/packages/c.tmbundle"]
|
||||
path = vendor/packages/c.tmbundle
|
||||
url = https://github.com/textmate/c.tmbundle.git
|
||||
[submodule "vendor/packages/objective-c.tmbundle"]
|
||||
path = vendor/packages/objective-c.tmbundle
|
||||
url = https://github.com/textmate/objective-c.tmbundle.git
|
||||
[submodule "vendor/packages/git.tmbundle"]
|
||||
path = vendor/packages/git.tmbundle
|
||||
url = https://github.com/kevinsawicki/git.tmbundle.git
|
||||
[submodule "vendor/packages/json.tmbundle"]
|
||||
path = vendor/packages/json.tmbundle
|
||||
url = https://github.com/textmate/json.tmbundle.git
|
||||
[submodule "vendor/packages/shellscript.tmbundle"]
|
||||
path = vendor/packages/shellscript.tmbundle
|
||||
url = https://github.com/textmate/shellscript.tmbundle
|
||||
[submodule "vendor/packages/xml.tmbundle"]
|
||||
path = vendor/packages/xml.tmbundle
|
||||
url = https://github.com/textmate/xml.tmbundle.git
|
||||
[submodule "vendor/packages/property-list.tmbundle"]
|
||||
path = vendor/packages/property-list.tmbundle
|
||||
url = https://github.com/textmate/property-list.tmbundle.git
|
||||
[submodule "vendor/packages/python.tmbundle"]
|
||||
path = vendor/packages/python.tmbundle
|
||||
url = https://github.com/textmate/python.tmbundle
|
||||
[submodule "vendor/packages/clojure.tmbundle"]
|
||||
path = vendor/packages/clojure.tmbundle
|
||||
url = https://github.com/mmcgrana/textmate-clojure
|
||||
[submodule "vendor/packages/yaml.tmbundle"]
|
||||
path = vendor/packages/yaml.tmbundle
|
||||
url = https://github.com/textmate/yaml.tmbundle.git
|
||||
[submodule "vendor/packages/java.tmbundle"]
|
||||
path = vendor/packages/java.tmbundle
|
||||
url = https://github.com/textmate/java.tmbundle.git
|
||||
[submodule "vendor/packages/php.tmbundle"]
|
||||
path = vendor/packages/php.tmbundle
|
||||
url = https://github.com/textmate/php.tmbundle.git
|
||||
[submodule "vendor/packages/perl.tmbundle"]
|
||||
path = vendor/packages/perl.tmbundle
|
||||
url = https://github.com/textmate/perl.tmbundle.git
|
||||
[submodule "vendor/packages/sass.tmbundle"]
|
||||
path = vendor/packages/sass.tmbundle
|
||||
url = https://github.com/alexsancho/SASS.tmbundle.git
|
||||
[submodule "vendor/packages/less.tmbundle"]
|
||||
path = vendor/packages/less.tmbundle
|
||||
url = https://github.com/mathewbyrne/less.tmbundle.git
|
||||
[submodule "vendor/packages/mustache.tmbundle"]
|
||||
path = vendor/packages/mustache.tmbundle
|
||||
url = https://github.com/kevinsawicki/Mustache.tmbundle.git
|
||||
[submodule "vendor/packages/go.tmbundle"]
|
||||
path = vendor/packages/go.tmbundle
|
||||
url = https://github.com/rsms/Go.tmbundle
|
||||
[submodule "vendor/bootstrap"]
|
||||
path = vendor/bootstrap
|
||||
url = https://github.com/twitter/bootstrap
|
||||
[submodule "vendor/packages/pegjs.tmbundle"]
|
||||
path = vendor/packages/pegjs.tmbundle
|
||||
url = https://github.com/alexstrat/PEGjs.tmbundle
|
||||
[submodule "vendor/packages/sql.tmbundle"]
|
||||
path = vendor/packages/sql.tmbundle
|
||||
url = https://github.com/textmate/sql.tmbundle
|
||||
[submodule "vendor/packages/hyperlink-helper.tmbundle"]
|
||||
path = vendor/packages/hyperlink-helper.tmbundle
|
||||
url = https://github.com/textmate/hyperlink-helper.tmbundle
|
||||
[submodule "vendor/apm"]
|
||||
path = vendor/apm
|
||||
url = https://github.com/github/apm.git
|
||||
|
30
package.json
30
package.json
@ -29,7 +29,35 @@
|
||||
"optimist": "0.4.0",
|
||||
"season": "0.7.0",
|
||||
"humanize-plus": "1.1.0",
|
||||
"semver": "1.1.4"
|
||||
"semver": "1.1.4",
|
||||
"c-tmbundle": "1.0.0",
|
||||
"coffee-script-tmbundle": "2.0.0",
|
||||
"css-tmbundle": "1.0.0",
|
||||
"git-tmbundle": "1.0.0",
|
||||
"go-tmbundle": "1.0.0",
|
||||
"html-tmbundle": "1.0.0",
|
||||
"hyperlink-helper-tmbundle": "1.0.0",
|
||||
"java-tmbundle": "1.0.0",
|
||||
"javascript-tmbundle": "1.0.0",
|
||||
"json-tmbundle": "1.0.0",
|
||||
"less-tmbundle": "1.0.0",
|
||||
"mustache-tmbundle": "1.0.0",
|
||||
"objective-c-tmbundle": "1.0.0",
|
||||
"pegjs-tmbundle": "1.0.0",
|
||||
"perl-tmbundle": "1.0.0",
|
||||
"php-tmbundle": "1.0.0",
|
||||
"property-list-tmbundle": "1.0.0",
|
||||
"puppet-textmate-tmbundle": "1.0.0",
|
||||
"python-tmbundle": "1.0.0",
|
||||
"ruby-on-rails-tmbundle": "1.0.0",
|
||||
"ruby-tmbundle": "1.0.0",
|
||||
"sass-tmbundle": "1.0.0",
|
||||
"shellscript-tmbundle": "1.0.0",
|
||||
"sql-tmbundle": "1.0.0",
|
||||
"text-tmbundle": "1.0.0",
|
||||
"textmate-clojure": "1.0.0",
|
||||
"xml-tmbundle": "1.0.0",
|
||||
"yaml-tmbundle": "1.0.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"biscotto": "0.0.11"
|
||||
|
@ -2,4 +2,5 @@
|
||||
|
||||
set -ex
|
||||
rm -rf ~/.atom
|
||||
git clean -df
|
||||
rake clean test
|
||||
|
@ -92,8 +92,16 @@ window.atom =
|
||||
|
||||
resolvePackagePath: (name) ->
|
||||
return name if fsUtils.isDirectory(name)
|
||||
|
||||
path = fsUtils.resolve(config.packageDirPaths..., name)
|
||||
path if fsUtils.isDirectory(path)
|
||||
return path if fsUtils.isDirectory(path)
|
||||
|
||||
packagePath = fsUtils.join(window.resourcePath, 'node_modules', name)
|
||||
return packagePath if @isInternalPackage(packagePath)
|
||||
|
||||
isInternalPackage: (packagePath) ->
|
||||
{engines} = Package.loadMetadata(packagePath, true)
|
||||
engines?.atom?
|
||||
|
||||
getLoadedPackage: (name) ->
|
||||
@loadedPackages[name]
|
||||
@ -109,9 +117,14 @@ window.atom =
|
||||
|
||||
getAvailablePackagePaths: ->
|
||||
packagePaths = []
|
||||
|
||||
for packageDirPath in config.packageDirPaths
|
||||
for packagePath in fsUtils.list(packageDirPath)
|
||||
packagePaths.push(packagePath) if fsUtils.isDirectory(packagePath)
|
||||
|
||||
for packagePath in fsUtils.list(fsUtils.join(window.resourcePath, 'node_modules'))
|
||||
packagePaths.push(packagePath) if @isInternalPackage(packagePath)
|
||||
|
||||
_.uniq(packagePaths)
|
||||
|
||||
getAvailablePackageNames: ->
|
||||
|
1
vendor/packages/c.tmbundle
vendored
1
vendor/packages/c.tmbundle
vendored
@ -1 +0,0 @@
|
||||
Subproject commit c8a6516c1131055bfcd1bca5e2ee6567c2f50058
|
1
vendor/packages/clojure.tmbundle
vendored
1
vendor/packages/clojure.tmbundle
vendored
@ -1 +0,0 @@
|
||||
Subproject commit 546b39c9725d88f1a0eaf74486ae50ca87ce368f
|
1
vendor/packages/coffee-script-tmbundle
vendored
1
vendor/packages/coffee-script-tmbundle
vendored
@ -1 +0,0 @@
|
||||
Subproject commit 32d2852470da251b19fa324bd69c476f845eaaa2
|
1
vendor/packages/css.tmbundle
vendored
1
vendor/packages/css.tmbundle
vendored
@ -1 +0,0 @@
|
||||
Subproject commit aa549903ff01e9ba7dc0bd83f2cfe7ab54feab2d
|
1
vendor/packages/git.tmbundle
vendored
1
vendor/packages/git.tmbundle
vendored
@ -1 +0,0 @@
|
||||
Subproject commit 5117cd42f1849d3a9b620fbf0b7c7d6d33c97172
|
1
vendor/packages/go.tmbundle
vendored
1
vendor/packages/go.tmbundle
vendored
@ -1 +0,0 @@
|
||||
Subproject commit d6db06051b8dd8683802d57e99bab6541c08f4d7
|
1
vendor/packages/html.tmbundle
vendored
1
vendor/packages/html.tmbundle
vendored
@ -1 +0,0 @@
|
||||
Subproject commit af4fef34e1df538eda9a166912047b610530ece0
|
1
vendor/packages/hyperlink-helper.tmbundle
vendored
1
vendor/packages/hyperlink-helper.tmbundle
vendored
@ -1 +0,0 @@
|
||||
Subproject commit e37fd810cd735032cfc4cae5c102e5a4b27e9a2f
|
1
vendor/packages/java.tmbundle
vendored
1
vendor/packages/java.tmbundle
vendored
@ -1 +0,0 @@
|
||||
Subproject commit 1c315ed46188e02d749939ec64160040d9c03f0b
|
1
vendor/packages/javascript.tmbundle
vendored
1
vendor/packages/javascript.tmbundle
vendored
@ -1 +0,0 @@
|
||||
Subproject commit 58e81b0eae498c9a4eb6e395368df3b7a01d9851
|
1
vendor/packages/json.tmbundle
vendored
1
vendor/packages/json.tmbundle
vendored
@ -1 +0,0 @@
|
||||
Subproject commit 5765750aa970c72decef3e2fcefec16a0f22e427
|
1
vendor/packages/less.tmbundle
vendored
1
vendor/packages/less.tmbundle
vendored
@ -1 +0,0 @@
|
||||
Subproject commit a202dd9942f96bac0ee3c42552a35480682790c9
|
1
vendor/packages/mustache.tmbundle
vendored
1
vendor/packages/mustache.tmbundle
vendored
@ -1 +0,0 @@
|
||||
Subproject commit 21ed7c4a49989a9bd30da496b083fe74c1c5b699
|
1
vendor/packages/objective-c.tmbundle
vendored
1
vendor/packages/objective-c.tmbundle
vendored
@ -1 +0,0 @@
|
||||
Subproject commit b0826e645a3d8ca37dd625a56935d49cc8eeb9fc
|
1
vendor/packages/pegjs.tmbundle
vendored
1
vendor/packages/pegjs.tmbundle
vendored
@ -1 +0,0 @@
|
||||
Subproject commit 8c75a902d6807d27cc54ffcc7cf7c8cc7c253914
|
1
vendor/packages/perl.tmbundle
vendored
1
vendor/packages/perl.tmbundle
vendored
@ -1 +0,0 @@
|
||||
Subproject commit fccaee006dbaddbde7ff36ec0b67efc638bbf476
|
1
vendor/packages/php.tmbundle
vendored
1
vendor/packages/php.tmbundle
vendored
@ -1 +0,0 @@
|
||||
Subproject commit bb576b557518802c458d85bc2c0a7430fe90e1a0
|
1
vendor/packages/property-list.tmbundle
vendored
1
vendor/packages/property-list.tmbundle
vendored
@ -1 +0,0 @@
|
||||
Subproject commit 8a2b90aec0551cd085ecc8a32ecc8a53769b5739
|
1
vendor/packages/puppet-textmate.tmbundle
vendored
1
vendor/packages/puppet-textmate.tmbundle
vendored
@ -1 +0,0 @@
|
||||
Subproject commit 5ef4949b2c964bace86782573cb952751ca77f5e
|
1
vendor/packages/python.tmbundle
vendored
1
vendor/packages/python.tmbundle
vendored
@ -1 +0,0 @@
|
||||
Subproject commit df88cd66d00ed44b1d1a212a347334bb8308299c
|
1
vendor/packages/ruby-on-rails-tmbundle
vendored
1
vendor/packages/ruby-on-rails-tmbundle
vendored
@ -1 +0,0 @@
|
||||
Subproject commit 683f6e652cc467e0007f80aa11f174a4d9189f3c
|
1
vendor/packages/ruby.tmbundle
vendored
1
vendor/packages/ruby.tmbundle
vendored
@ -1 +0,0 @@
|
||||
Subproject commit 4b74231cb27d8d6e8e917947c566d21ec9d6e76a
|
1
vendor/packages/sass.tmbundle
vendored
1
vendor/packages/sass.tmbundle
vendored
@ -1 +0,0 @@
|
||||
Subproject commit e2bef05afac130e4ebd1b2f8991e9563568faa47
|
1
vendor/packages/shellscript.tmbundle
vendored
1
vendor/packages/shellscript.tmbundle
vendored
@ -1 +0,0 @@
|
||||
Subproject commit 02893ae5fd12ba723fcf0ea834d3fb076d83e000
|
1
vendor/packages/sql.tmbundle
vendored
1
vendor/packages/sql.tmbundle
vendored
@ -1 +0,0 @@
|
||||
Subproject commit 1e047e07ad45d67ee7e747fae17bee896eef638f
|
1
vendor/packages/text.tmbundle
vendored
1
vendor/packages/text.tmbundle
vendored
@ -1 +0,0 @@
|
||||
Subproject commit 061224bd78fd98d02035466cdd959bf29995c2c5
|
1
vendor/packages/xml.tmbundle
vendored
1
vendor/packages/xml.tmbundle
vendored
@ -1 +0,0 @@
|
||||
Subproject commit 9d9446f7da37e259cea0bd4a054796c5f67d5af1
|
1
vendor/packages/yaml.tmbundle
vendored
1
vendor/packages/yaml.tmbundle
vendored
@ -1 +0,0 @@
|
||||
Subproject commit 173808ba47df99b22a43670bf4f8a71370339ae7
|
Loading…
Reference in New Issue
Block a user