first-mate
Advanced tools
Comparing version 5.0.1 to 5.0.2
30
api.json
@@ -6,3 +6,3 @@ { | ||
"filename": "src/grammar-registry.coffee", | ||
"srcUrl": "https://github.com/atom/first-mate/blob/v5.0.1/src/grammar-registry.coffee#L11", | ||
"srcUrl": "https://github.com/atom/first-mate/blob/v5.0.2/src/grammar-registry.coffee#L11", | ||
"sections": [ | ||
@@ -23,3 +23,3 @@ { | ||
"sectionName": "Event Subscription", | ||
"srcUrl": "https://github.com/atom/first-mate/blob/v5.0.1/src/grammar-registry.coffee#L36", | ||
"srcUrl": "https://github.com/atom/first-mate/blob/v5.0.2/src/grammar-registry.coffee#L36", | ||
"visibility": "Public", | ||
@@ -54,3 +54,3 @@ "summary": "Invoke the given callback when a grammar is added to the registry.", | ||
"sectionName": "Event Subscription", | ||
"srcUrl": "https://github.com/atom/first-mate/blob/v5.0.1/src/grammar-registry.coffee#L46", | ||
"srcUrl": "https://github.com/atom/first-mate/blob/v5.0.2/src/grammar-registry.coffee#L46", | ||
"visibility": "Public", | ||
@@ -85,3 +85,3 @@ "summary": "Invoke the given callback when a grammar is updated due to a grammar\nit depends on being added or removed from the registry.", | ||
"sectionName": "Managing Grammars", | ||
"srcUrl": "https://github.com/atom/first-mate/blob/v5.0.1/src/grammar-registry.coffee#L56", | ||
"srcUrl": "https://github.com/atom/first-mate/blob/v5.0.2/src/grammar-registry.coffee#L56", | ||
"visibility": "Public", | ||
@@ -100,3 +100,3 @@ "summary": "Get all the grammars in this registry.", | ||
"sectionName": "Managing Grammars", | ||
"srcUrl": "https://github.com/atom/first-mate/blob/v5.0.1/src/grammar-registry.coffee#L64", | ||
"srcUrl": "https://github.com/atom/first-mate/blob/v5.0.2/src/grammar-registry.coffee#L64", | ||
"visibility": "Public", | ||
@@ -123,3 +123,3 @@ "summary": "Get a grammar with the given scope name.", | ||
"sectionName": "Managing Grammars", | ||
"srcUrl": "https://github.com/atom/first-mate/blob/v5.0.1/src/grammar-registry.coffee#L76", | ||
"srcUrl": "https://github.com/atom/first-mate/blob/v5.0.2/src/grammar-registry.coffee#L76", | ||
"visibility": "Public", | ||
@@ -146,3 +146,3 @@ "summary": "Add a grammar to this registry.", | ||
"sectionName": "Managing Grammars", | ||
"srcUrl": "https://github.com/atom/first-mate/blob/v5.0.1/src/grammar-registry.coffee#L97", | ||
"srcUrl": "https://github.com/atom/first-mate/blob/v5.0.2/src/grammar-registry.coffee#L97", | ||
"visibility": "Public", | ||
@@ -169,3 +169,3 @@ "summary": "Remove the grammar with the given scope name.", | ||
"sectionName": "Managing Grammars", | ||
"srcUrl": "https://github.com/atom/first-mate/blob/v5.0.1/src/grammar-registry.coffee#L107", | ||
"srcUrl": "https://github.com/atom/first-mate/blob/v5.0.2/src/grammar-registry.coffee#L107", | ||
"visibility": "Public", | ||
@@ -192,3 +192,3 @@ "summary": "Read a grammar synchronously but don't add it to the registry.", | ||
"sectionName": "Managing Grammars", | ||
"srcUrl": "https://github.com/atom/first-mate/blob/v5.0.1/src/grammar-registry.coffee#L122", | ||
"srcUrl": "https://github.com/atom/first-mate/blob/v5.0.2/src/grammar-registry.coffee#L122", | ||
"visibility": "Public", | ||
@@ -235,3 +235,3 @@ "summary": "Read a grammar asynchronously but don't add it to the registry.", | ||
"sectionName": "Managing Grammars", | ||
"srcUrl": "https://github.com/atom/first-mate/blob/v5.0.1/src/grammar-registry.coffee#L139", | ||
"srcUrl": "https://github.com/atom/first-mate/blob/v5.0.2/src/grammar-registry.coffee#L139", | ||
"visibility": "Public", | ||
@@ -258,3 +258,3 @@ "summary": "Read a grammar synchronously and add it to this registry.", | ||
"sectionName": "Managing Grammars", | ||
"srcUrl": "https://github.com/atom/first-mate/blob/v5.0.1/src/grammar-registry.coffee#L152", | ||
"srcUrl": "https://github.com/atom/first-mate/blob/v5.0.2/src/grammar-registry.coffee#L152", | ||
"visibility": "Public", | ||
@@ -308,3 +308,3 @@ "summary": "Read a grammar asynchronously and add it to the registry.", | ||
"filename": "src/grammar.coffee", | ||
"srcUrl": "https://github.com/atom/first-mate/blob/v5.0.1/src/grammar.coffee#L19", | ||
"srcUrl": "https://github.com/atom/first-mate/blob/v5.0.2/src/grammar.coffee#L19", | ||
"sections": [ | ||
@@ -325,3 +325,3 @@ { | ||
"sectionName": "Event Subscription", | ||
"srcUrl": "https://github.com/atom/first-mate/blob/v5.0.1/src/grammar.coffee#L59", | ||
"srcUrl": "https://github.com/atom/first-mate/blob/v5.0.2/src/grammar.coffee#L59", | ||
"visibility": "Public", | ||
@@ -348,3 +348,3 @@ "summary": "Invoke the given callback when this grammar is updated due to a\ngrammar it depends on being added or removed from the registry.", | ||
"sectionName": "Tokenizing", | ||
"srcUrl": "https://github.com/atom/first-mate/blob/v5.0.1/src/grammar.coffee#L71", | ||
"srcUrl": "https://github.com/atom/first-mate/blob/v5.0.2/src/grammar.coffee#L71", | ||
"visibility": "Public", | ||
@@ -371,3 +371,3 @@ "summary": "Tokenize all lines in the given text.", | ||
"sectionName": "Tokenizing", | ||
"srcUrl": "https://github.com/atom/first-mate/blob/v5.0.1/src/grammar.coffee#L101", | ||
"srcUrl": "https://github.com/atom/first-mate/blob/v5.0.2/src/grammar.coffee#L101", | ||
"visibility": "Public", | ||
@@ -374,0 +374,0 @@ "summary": "Tokenize the line of text.", |
@@ -86,3 +86,3 @@ (function() { | ||
Grammar.prototype.tokenizeLine = function(line, ruleStack, firstLine, compatibilityMode) { | ||
var contentScopeName, currentRuleHasAdvanced, initialRule, initialRuleStackLength, lastRule, lastSymbol, match, nextTags, openScopeTags, penultimateRule, popStack, position, previousPosition, previousRuleStackLength, rule, scopeName, tag, tags, tagsEnd, tagsStart, tokenCount, _i, _j, _k, _len, _len1, _len2, _ref, _ref1, _ref2, _ref3, _ref4, _ref5; | ||
var contentScopeName, initialRule, initialRuleStackLength, lastRule, lastSymbol, match, nextTags, openScopeTags, penultimateRule, popStack, position, previousPosition, previousRuleStackLength, rule, scopeName, tag, tags, tagsEnd, tagsStart, tokenCount, _i, _j, _k, _len, _len1, _len2, _ref, _ref1, _ref2, _ref3, _ref4, _ref5; | ||
if (firstLine == null) { | ||
@@ -132,3 +132,2 @@ firstLine = false; | ||
tokenCount = 0; | ||
currentRuleHasAdvanced = true; | ||
while (true) { | ||
@@ -174,9 +173,3 @@ previousRuleStackLength = ruleStack.length; | ||
if (position === previousPosition) { | ||
if (ruleStack.length < previousRuleStackLength) { | ||
if (!currentRuleHasAdvanced) { | ||
console.error("Skipping line because rule loops at column " + position + " of line '" + line + "'", _.clone(ruleStack)); | ||
tags.push(line.length - position); | ||
break; | ||
} | ||
} else if (ruleStack.length === previousRuleStackLength) { | ||
if (ruleStack.length === previousRuleStackLength) { | ||
console.error("Popping rule because it loops at column " + position + " of line '" + line + "'", _.clone(ruleStack)); | ||
@@ -199,3 +192,2 @@ if (ruleStack.length > 1) { | ||
_ref3 = ruleStack.slice(-2), (_ref4 = _ref3[0], penultimateRule = _ref4.rule), (_ref5 = _ref3[1], lastRule = _ref5.rule); | ||
currentRuleHasAdvanced = false; | ||
if ((lastRule != null) && lastRule === penultimateRule) { | ||
@@ -217,4 +209,2 @@ popStack = true; | ||
} | ||
} else { | ||
currentRuleHasAdvanced = true; | ||
} | ||
@@ -221,0 +211,0 @@ } |
{ | ||
"name": "first-mate", | ||
"version": "5.0.1", | ||
"version": "5.0.2", | ||
"description": "TextMate helpers", | ||
@@ -5,0 +5,0 @@ "main": "./lib/first-mate.js", |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
645339
16229