From 7cb8850ed2d4223bd875040e1eec2f3a497aec09 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Wed, 17 Apr 2013 17:57:30 -0700 Subject: [PATCH] Expect single scope as parameter to scope matcher --- .../text-mate-scope-selector-pattern.pegjs | 26 ++++++++----------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/src/app/text-mate-scope-selector-pattern.pegjs b/src/app/text-mate-scope-selector-pattern.pegjs index c92993b9e..e30b47c86 100644 --- a/src/app/text-mate-scope-selector-pattern.pegjs +++ b/src/app/text-mate-scope-selector-pattern.pegjs @@ -18,24 +18,20 @@ segment scope = first:segment others:("." segment)* { - return function(scopes) { + return function(scope) { var segments = [first]; for (var i = 0; i < others.length; i++) segments.push(others[i][1]); - for (var i = 0; i < scopes.length; i++) { - var scopeSegments = scopes[i].split("."); - if (scopeSegments.length < segments.length) - continue; - var allSegmentsMatch = true; - for (var j = 0; j < segments.length; j++) - if (!segments[j](scopeSegments[j])) { - allSegmentsMatch = false; - break; - } - if (allSegmentsMatch) - return true; - } - return false; + + var scopeSegments = scope.split("."); + if (scopeSegments.length < segments.length) + return false; + + var allSegmentsMatch = true; + for (var j = 0; j < segments.length; j++) + if (!segments[j](scopeSegments[j])) + return false; + return true; } }