This commit is contained in:
msftrncs 2019-02-05 00:26:28 -06:00
Родитель 6b4f4d7bfd
Коммит c91ec4ff87
1 изменённых файлов: 13 добавлений и 13 удалений

Просмотреть файл

@ -601,19 +601,6 @@ export class RuleFactory {
);
}
if (!desc.begin) {
if (desc.repository) {
repository = mergeObjects({}, repository, desc.repository);
}
return new IncludeOnlyRule(
desc.$vscodeTextmateLocation,
desc.id,
desc.name,
desc.contentName,
RuleFactory._compilePatterns(desc.patterns, helper, repository)
);
}
if (desc.while) {
return new BeginWhileRule(
desc.$vscodeTextmateLocation,
@ -626,6 +613,19 @@ export class RuleFactory {
);
}
if (!desc.begin && !desc.end) {
if (desc.repository) {
repository = mergeObjects({}, repository, desc.repository);
}
return new IncludeOnlyRule(
desc.$vscodeTextmateLocation,
desc.id,
desc.name,
desc.contentName,
RuleFactory._compilePatterns(desc.patterns, helper, repository)
);
}
return new BeginEndRule(
desc.$vscodeTextmateLocation,
desc.id,