From a83f3dd9c53fd2fad58007485ba969836d8794df Mon Sep 17 00:00:00 2001 From: Dmitry Trofimov Date: Thu, 22 Oct 2015 13:47:31 +0200 Subject: [PATCH 1/2] Restore cwd if it was changed during test execution (PY-17136) --- python/helpers/coverage_runner/run_coverage.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/python/helpers/coverage_runner/run_coverage.py b/python/helpers/coverage_runner/run_coverage.py index c9892d815929..f637d6e8d42c 100644 --- a/python/helpers/coverage_runner/run_coverage.py +++ b/python/helpers/coverage_runner/run_coverage.py @@ -40,6 +40,8 @@ for arg in sys.argv: argv.append(arg) sys.argv = argv +cwd = os.getcwd() main() if run_cov: + os.chdir(cwd) main(["xml", "-o", coverage_file + ".xml", "--ignore-errors"]) \ No newline at end of file From 9af6388d78f3cbf943ed75f8d0561c4ffbb81710 Mon Sep 17 00:00:00 2001 From: irengrig Date: Thu, 22 Oct 2015 14:02:25 +0200 Subject: [PATCH 2/2] import code style options: reset current scheme panel after import if current scheme was updated --- .../application/options/CodeStyleSchemesConfigurable.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/lang-impl/src/com/intellij/application/options/CodeStyleSchemesConfigurable.java b/platform/lang-impl/src/com/intellij/application/options/CodeStyleSchemesConfigurable.java index cd1c8db4600a..4a52e0efca5c 100644 --- a/platform/lang-impl/src/com/intellij/application/options/CodeStyleSchemesConfigurable.java +++ b/platform/lang-impl/src/com/intellij/application/options/CodeStyleSchemesConfigurable.java @@ -276,7 +276,7 @@ public class CodeStyleSchemesConfigurable extends SearchableConfigurable.Parent. @Override public void schemeChanged(final CodeStyleScheme scheme) { - //do nothing + reset(); } }); }