From 927e9c3de8b8fa5002b1200179d952b6238d112d Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 22 Apr 2013 12:18:05 -0700 Subject: [PATCH] Upgrade to oniguruma 0.11 --- package.json | 2 +- src/app/text-mate-grammar.coffee | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/package.json b/package.json index cfd157fb8..2ac9bb878 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "dependencies": { "coffee-script": "1.6.2", "ctags": "0.3.0", - "oniguruma": "0.8.0", + "oniguruma": "0.11.0", "mkdirp": "0.3.5", "git-utils": "0.14.0", "underscore": "1.4.4", diff --git a/src/app/text-mate-grammar.coffee b/src/app/text-mate-grammar.coffee index e88f23edc..caf0b92f4 100644 --- a/src/app/text-mate-grammar.coffee +++ b/src/app/text-mate-grammar.coffee @@ -250,7 +250,6 @@ class Rule scanners = injections.getScanners(ruleStack, position, firstLine, @anchorPosition) for scanner in scanners result = scanner.findNextMatch(line, position) - result?.scanner = scanner return result if result? normalizeCaptureIndices: (line, captureIndices) -> @@ -265,7 +264,6 @@ class Rule scanner = @getScanner(baseGrammar, position, firstLine) result = scanner.findNextMatch(lineWithNewline, position) - result?.scanner = scanner @normalizeCaptureIndices(line, result.captureIndices) if result? injectionResult = @scanInjections(ruleStack, lineWithNewline, position, firstLine)