diff options
Diffstat (limited to 'bin/flycheck-android-java.py')
| -rw-r--r-- | bin/flycheck-android-java.py | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/bin/flycheck-android-java.py b/bin/flycheck-android-java.py index 37c1b68..3c0912c 100644 --- a/bin/flycheck-android-java.py +++ b/bin/flycheck-android-java.py @@ -120,6 +120,21 @@ Otherwise return None.""" return files[0:i] + files[i + 1:] return None +def split_variant(variant): + ret = [] + last = 0 + for i in range(0, len(variant)): + if variant[i:i+1].isupper(): + ret.append(variant[last:i]) + last = i + ret.append(variant[last:]) + return ret + +def match_variant(variant1, variant2): + v1 = split_variant(variant1) + v2 = split_variant(variant2) + return all(x in v1 for x in v2) or all(x in v2 for x in v1) + def figure_out_java_compilation(sessiondir, sourcefile, tempfile, checkstyle, variant, run_gen, force=False): """Get options for Java compilation from gradle project and run javac.""" @@ -207,7 +222,7 @@ def figure_out_java_compilation(sessiondir, sourcefile, tempfile, checkstyle, if variant: for v in variants: data = v['data'] - if 'variant' in data and data['variant'] == variant: + if 'variant' in data and match_variant(data['variant'], variant): if not fallback: fallback = data files = file_in_list(sourcefile, data['files']) |