github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-24 22:38:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into mkt-url-based-command-dispatch

Browse Source
This commit is contained in:
Michelle Tilley
2017-09-21 13:51:15 -07:00
parent f5d1539645 8e300643fa
commit 3621f07149
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
package.json
View File

@@ -93,7 +93,7 @@
"archive-view": "0.63.3",
"autocomplete-atom-api": "0.10.3",
"autocomplete-css": "0.17.3",
"autocomplete-html": "0.8.1",
"autocomplete-html": "0.8.2",
"autocomplete-plus": "2.35.10",
"autocomplete-snippets": "1.11.1",
"autoflow": "0.29.0",
@@ -144,14 +144,14 @@
"language-gfm": "0.90.1",
"language-git": "0.19.1",
"language-go": "0.44.2",
"language-html": "0.47.7",
"language-html": "0.48.0",
"language-hyperlink": "0.16.2",
"language-java": "0.27.4",
"language-javascript": "0.127.3",
"language-javascript": "0.127.5",
"language-json": "0.19.1",
"language-less": "0.33.0",
"language-make": "0.22.3",
"language-mustache": "0.14.1",
"language-mustache": "0.14.2",
"language-objective-c": "0.15.1",
"language-perl": "0.37.0",
"language-php": "0.42.0",

2
spec/tokenized-buffer-spec.coffee
View File

@@ -345,7 +345,7 @@ describe "TokenizedBuffer", ->
runs ->
fullyTokenize(tokenizedBuffer)
{tokens} = tokenizedBuffer.tokenizedLines[0]
expect(tokens[0]).toEqual value: '<', scopes: ["text.html.ruby", "meta.tag.block.any.html", "punctuation.definition.tag.begin.html"]
expect(tokens[0]).toEqual value: '<', scopes: ["text.html.ruby", "meta.tag.block.div.html", "punctuation.definition.tag.begin.html"]
describe ".tokenForPosition(position)", ->
afterEach ->