<% <<-SQL select * from users;")
expect(tokens[12].value).toBe " select * from users;"
- atom.activatePackage('sql-tmbundle', sync: true)
+ atom.activatePackage('language-sql', sync: true)
expect(grammarUpdatedHandler).toHaveBeenCalled()
{tokens} = grammar.tokenizeLine("
<% <<-SQL select * from users;")
expect(tokens[12].value).toBe " "
@@ -260,8 +260,8 @@ describe "TextMateGrammar", ->
describe "when a grammar matching the desired scope is unavailable", ->
it "updates the grammar if a matching grammar is added later", ->
- atom.deactivatePackage('html-tmbundle')
- atom.activatePackage('ruby-on-rails-tmbundle', sync: true)
+ atom.deactivatePackage('language-html')
+ atom.activatePackage('language-ruby-on-rails', sync: true)
grammar = syntax.grammarForScopeName('text.html.ruby')
{tokens} = grammar.tokenizeLine("
<%= User.find(2).full_name %>
")
@@ -270,7 +270,7 @@ describe "TextMateGrammar", ->
expect(tokens[2]).toEqual value: ' ', scopes: ["text.html.ruby","source.ruby.rails.embedded.html"]
expect(tokens[3]).toEqual value: 'User', scopes: ["text.html.ruby","source.ruby.rails.embedded.html","support.class.ruby"]
- atom.activatePackage('html-tmbundle', sync: true)
+ atom.activatePackage('language-html', sync: true)
{tokens} = grammar.tokenizeLine("
<%= User.find(2).full_name %>
")
expect(tokens[0]).toEqual value: '<', scopes: ["text.html.ruby","meta.tag.block.any.html","punctuation.definition.tag.begin.html"]
expect(tokens[1]).toEqual value: 'div', scopes: ["text.html.ruby","meta.tag.block.any.html","entity.name.tag.block.any.html"]
@@ -314,7 +314,7 @@ describe "TextMateGrammar", ->
describe "when inside a C block", ->
beforeEach ->
- atom.activatePackage('c-tmbundle', sync: true)
+ atom.activatePackage('language-c', sync: true)
it "correctly parses a method. (regression)", ->
grammar = syntax.selectGrammar("hello.c")
@@ -339,7 +339,7 @@ describe "TextMateGrammar", ->
describe "when a grammar has a pattern that has back references in the match value", ->
it "does not special handle the back references and instead allows oniguruma to resolve them", ->
- atom.activatePackage('sass-tmbundle', sync: true)
+ atom.activatePackage('language-sass', sync: true)
grammar = syntax.selectGrammar("style.scss")
{tokens} = grammar.tokenizeLine("@mixin x() { -moz-selector: whatever; }")
expect(tokens[9]).toEqual value: "-moz-selector", scopes: ["source.css.scss", "meta.property-list.scss", "meta.property-name.scss"]
@@ -428,14 +428,14 @@ describe "TextMateGrammar", ->
describe "when the grammar's pattern name has a group number in it", ->
it "replaces the group number with the matched captured text", ->
- atom.activatePackage('hyperlink-helper-tmbundle', sync: true)
+ atom.activatePackage('language-hyperlink', sync: true)
grammar = syntax.grammarForScopeName("text.hyperlink")
{tokens} = grammar.tokenizeLine("https://github.com")
expect(tokens[0].scopes).toEqual ["text.hyperlink", "markup.underline.link.https.hyperlink"]
describe "when the grammar has an injection selector", ->
it "includes the grammar's patterns when the selector matches the current scope in other grammars", ->
- atom.activatePackage('hyperlink-helper-tmbundle', sync: true)
+ atom.activatePackage('language-hyperlink', sync: true)
grammar = syntax.selectGrammar("text.js")
{tokens} = grammar.tokenizeLine("var i; // http://github.com")
@@ -454,7 +454,7 @@ describe "TextMateGrammar", ->
expect(tokens[1].value).toBe " http://github.com"
expect(tokens[1].scopes).toEqual ["source.js", "comment.line.double-slash.js"]
- atom.activatePackage('hyperlink-helper-tmbundle', sync: true)
+ atom.activatePackage('language-hyperlink', sync: true)
{tokens} = editSession.lineForScreenRow(0)
expect(tokens[2].value).toBe "http://github.com"
@@ -481,7 +481,7 @@ describe "TextMateGrammar", ->
expect(tokens[1].value).toBe " SELECT * FROM OCTOCATS"
expect(tokens[1].scopes).toEqual ["source.js", "comment.line.double-slash.js"]
- atom.activatePackage('sql-tmbundle', sync: true)
+ atom.activatePackage('language-sql', sync: true)
{tokens} = editSession.lineForScreenRow(0)
expect(tokens[2].value).toBe "SELECT"
@@ -514,7 +514,7 @@ describe "TextMateGrammar", ->
lines = null
beforeEach ->
- atom.activatePackage('todo-tmbundle', sync: true)
+ atom.activatePackage('language-todo', sync: true)
grammar = syntax.selectGrammar('main.rb')
lines = grammar.tokenizeLines "# TODO be nicer"
@@ -528,7 +528,7 @@ describe "TextMateGrammar", ->
describe "Git commit messages", ->
beforeEach ->
- atom.activatePackage('git-tmbundle', sync: true)
+ atom.activatePackage('language-git', sync: true)
grammar = syntax.selectGrammar('COMMIT_EDITMSG')
lines = grammar.tokenizeLines """
longggggggggggggggggggggggggggggggggggggggggggggggg
@@ -547,7 +547,7 @@ describe "TextMateGrammar", ->
describe "C++", ->
beforeEach ->
- atom.activatePackage('c-tmbundle', sync: true)
+ atom.activatePackage('language-c', sync: true)
grammar = syntax.selectGrammar('includes.cc')
lines = grammar.tokenizeLines """
#include "a.h"
@@ -585,8 +585,8 @@ describe "TextMateGrammar", ->
describe "Objective-C", ->
beforeEach ->
- atom.activatePackage('c-tmbundle', sync: true)
- atom.activatePackage('objective-c-tmbundle', sync: true)
+ atom.activatePackage('language-c', sync: true)
+ atom.activatePackage('language-objective-c', sync: true)
grammar = syntax.selectGrammar('function.mm')
lines = grammar.tokenizeLines """
void test() {
@@ -612,7 +612,7 @@ describe "TextMateGrammar", ->
describe "Java", ->
beforeEach ->
- atom.activatePackage('java-tmbundle', sync: true)
+ atom.activatePackage('language-java', sync: true)
grammar = syntax.selectGrammar('Function.java')
it "correctly parses single line comments", ->
@@ -664,7 +664,7 @@ describe "TextMateGrammar", ->
describe "when the line contains unicode characters", ->
it "correctly parses tokens starting after them", ->
- atom.activatePackage('json-tmbundle', sync: true)
+ atom.activatePackage('language-json', sync: true)
grammar = syntax.selectGrammar('package.json')
{tokens} = grammar.tokenizeLine '{"\u2026": 1}'
diff --git a/spec/tokenized-buffer-spec.coffee b/spec/tokenized-buffer-spec.coffee
index 70159ce7a..dd36ec316 100644
--- a/spec/tokenized-buffer-spec.coffee
+++ b/spec/tokenized-buffer-spec.coffee
@@ -5,7 +5,7 @@ describe "TokenizedBuffer", ->
[tokenizedBuffer, buffer, changeHandler] = []
beforeEach ->
- atom.activatePackage('javascript-tmbundle', sync: true)
+ atom.activatePackage('language-javascript', sync: true)
# enable async tokenization
TokenizedBuffer.prototype.chunkSize = 5
jasmine.unspy(TokenizedBuffer.prototype, 'tokenizeInBackground')
@@ -319,7 +319,7 @@ describe "TokenizedBuffer", ->
describe "when the buffer contains hard-tabs", ->
beforeEach ->
- atom.activatePackage('coffee-script-tmbundle', sync: true)
+ atom.activatePackage('language-coffee-script', sync: true)
buffer = project.bufferForPathSync('sample-with-tabs.coffee')
tokenizedBuffer = new TokenizedBuffer({buffer})
startTokenizing(tokenizedBuffer)
@@ -349,7 +349,7 @@ describe "TokenizedBuffer", ->
describe "when the buffer contains surrogate pairs", ->
beforeEach ->
- atom.activatePackage('javascript-tmbundle', sync: true)
+ atom.activatePackage('language-javascript', sync: true)
buffer = project.buildBufferSync 'sample-with-pairs.js', """
'abc\uD835\uDF97def'
//\uD835\uDF97xyz
@@ -386,8 +386,8 @@ describe "TokenizedBuffer", ->
describe "when the grammar is updated because a grammar it includes is activated", ->
it "retokenizes the buffer", ->
- atom.activatePackage('ruby-on-rails-tmbundle', sync: true)
- atom.activatePackage('ruby-tmbundle', sync: true)
+ atom.activatePackage('language-ruby-on-rails', sync: true)
+ atom.activatePackage('language-ruby', sync: true)
buffer = project.bufferForPathSync(null, "
<%= User.find(2).full_name %>
")
tokenizedBuffer = new TokenizedBuffer({buffer})
@@ -397,7 +397,7 @@ describe "TokenizedBuffer", ->
{tokens} = tokenizedBuffer.lineForScreenRow(0)
expect(tokens[0]).toEqual value: "
", scopes: ["text.html.ruby"]
- atom.activatePackage('html-tmbundle', sync: true)
+ atom.activatePackage('language-html', sync: true)
fullyTokenize(tokenizedBuffer)
{tokens} = tokenizedBuffer.lineForScreenRow(0)
expect(tokens[0]).toEqual value: '<', scopes: ["text.html.ruby","meta.tag.block.any.html","punctuation.definition.tag.begin.html"]
diff --git a/src/package-manager.coffee b/src/package-manager.coffee
index 66f06d2ef..3105791ad 100644
--- a/src/package-manager.coffee
+++ b/src/package-manager.coffee
@@ -94,6 +94,13 @@ class PackageManager
packagePath = path.join(@resourcePath, 'node_modules', name)
return packagePath if @isInternalPackage(packagePath)
+ #TODO Remove once all package specs have been updated
+ if match = /(.+)-tmbundle$/.exec(name)
+ if name is 'hyperlink-helper-tmbundle'
+ @resolvePackagePath('language-hyperlink')
+ else
+ @resolvePackagePath("language-#{match[1]}")
+
isInternalPackage: (packagePath) ->
{engines} = Package.loadMetadata(packagePath, true)
engines?.atom?
diff --git a/src/text-mate-package.coffee b/src/text-mate-package.coffee
index 8e7013d88..0ab3500b3 100644
--- a/src/text-mate-package.coffee
+++ b/src/text-mate-package.coffee
@@ -10,7 +10,8 @@ async = require 'async'
module.exports =
class TextMatePackage extends Package
@testName: (packageName) ->
- /(\.|_|-)tmbundle$/.test(packageName)
+ packageName = path.basename(packageName)
+ /(^language-.+)|((\.|_|-)tmbundle$)/.test(packageName)
@getLoadQueue: ->
return @loadQueue if @loadQueue
diff --git a/tasks/publish-packages.coffee b/tasks/publish-packages.coffee
new file mode 100644
index 000000000..3f274919c
--- /dev/null
+++ b/tasks/publish-packages.coffee
@@ -0,0 +1,98 @@
+async = require 'async'
+request = require 'request'
+
+# Configure and publish all packages in package.json to atom.io
+#
+# This task should be run whenever you want to be sure that atom.io contains
+# all the packages and versions referenced in Atom's package.json file.
+module.exports = (grunt) ->
+ baseUrl = "https://www.atom.io/api/packages"
+
+ packageExists = (packageName, token, callback) ->
+ requestSettings =
+ url: "#{baseUrl}/#{packageName}"
+ json: true
+ headers:
+ authorization: token
+ request.get requestSettings, (error, response, body={}) ->
+ if error?
+ callback(error)
+ else
+ callback(null, response.statusCode is 404)
+
+ createPackage = (packageName, token, callback) ->
+ requestSettings =
+ url: baseUrl
+ json: true
+ headers:
+ authorization: token
+ method: 'POST'
+ body:
+ repository: "atom/#{packageName}"
+
+ request.get requestSettings, (error, response, body={}) ->
+ if error?
+ callback(error)
+ else if response.statusCode isnt 201
+ message = body.message ? body.error ? body
+ callback(new Error("Creating package failed: #{message}"))
+ else
+ callback()
+
+ createPackageVersion = (packageName, tag, token, callback) ->
+ requestSettings =
+ url: "#{baseUrl}/#{packageName}/versions"
+ json: true
+ method: 'POST'
+ headers:
+ authorization: token
+ body:
+ tag: tag
+
+ request.get requestSettings, (error, response, body={}) ->
+ if error?
+ callback(error)
+ else if response.statusCode isnt 201
+ message = body.message ? body.error ? body
+ if message is 'Version exists'
+ callback()
+ else
+ callback(new Error("Creating new version failed: #{message}"))
+ else
+ callback()
+
+ grunt.registerTask 'publish-packages', 'Publish all bundled packages', ->
+ token = process.env.ATOM_ACCESS_TOKEN
+ unless token
+ grunt.log.error('Must set ATOM_ACCESS_TOKEN environment variable')
+ return false
+
+ {packageDependencies} = grunt.file.readJSON('package.json') ? {}
+ done = @async()
+
+ tasks = []
+ for name, version of packageDependencies
+ do (name, version) ->
+ tasks.push (callback) ->
+ grunt.log.writeln("Publishing #{name}@#{version}")
+ tag = "v#{version}"
+ packageExists name, token, (error, exists) ->
+ if error?
+ callback(error)
+ return
+
+ if exists
+ createPackage name, token, (error) ->
+ if error?
+ callback(error)
+ else
+ createPackageVersion(name, tag, token, callback)
+ else
+ createPackageVersion(name, tag, token, callback)
+
+ async.waterfall tasks, (error) ->
+ if error?
+ grunt.log.error(error.message)
+ done(false)
+ else
+ done()
diff --git a/vendor/apm b/vendor/apm
index 6ef00ae8b..3d64c688c 160000
--- a/vendor/apm
+++ b/vendor/apm
@@ -1 +1 @@
-Subproject commit 6ef00ae8b1fc7c6ca96f6ce38859cd31db1f7430
+Subproject commit 3d64c688c59769ef707533b8002c0f3b3c1578d8