From 891a9cbaa5e76b1e9382e53689aaf5b708268abf Mon Sep 17 00:00:00 2001 From: ZyX Date: Fri, 19 Sep 2014 22:20:01 +0400 Subject: [PATCH] Add Context.enter_item function for processing marked iterable items --- powerline/lint/context.py | 3 +++ powerline/lint/spec.py | 5 ++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/powerline/lint/context.py b/powerline/lint/context.py index 1c188129..e9a8cef6 100644 --- a/powerline/lint/context.py +++ b/powerline/lint/context.py @@ -58,3 +58,6 @@ class Context(tuple): def enter_key(self, value, key): return self + ((value.keydict[key], value[key]),) + + def enter_item(self, name, item): + return self + ((MarkedUnicode(name, item.mark), item),) diff --git a/powerline/lint/spec.py b/powerline/lint/spec.py index 94c6f96c..b446337a 100644 --- a/powerline/lint/spec.py +++ b/powerline/lint/spec.py @@ -8,7 +8,6 @@ from copy import copy from powerline.lib.unicode import unicode from powerline.lint.markedjson.error import echoerr, DelayedEchoErr -from powerline.lint.markedjson.markedvalue import MarkedUnicode from powerline.lint.selfcheck import havemarks from powerline.lint.context import list_sep @@ -108,7 +107,7 @@ class Spec(object): item, value.mark, data, - context + ((MarkedUnicode('list item ' + unicode(i), item.mark), item),), + context.enter_item('list item ' + unicode(i), item), echoerr ) else: @@ -149,7 +148,7 @@ class Spec(object): item, value.mark, data, - context + ((MarkedUnicode('tuple item ' + unicode(i), item.mark), item),), + context.enter_item('tuple item ' + unicode(i), item), echoerr ) if ihadproblem: