From b13c5e405cdc918bdfe7c0338bd41e9704adff4b Mon Sep 17 00:00:00 2001 From: Mikhail Golubev Date: Tue, 8 Aug 2017 19:02:18 +0300 Subject: [PATCH] Properly restore ModifiableRootModel in PyIndexingTest#testTodoIndexInLibs Calling m.addContentEntry(e.getFile()) is not enough, since it just adds an empty content entry without any attached source roots which, in turn, breaks subsequent tests afterwards. --- .../testSrc/com/jetbrains/python/PyIndexingTest.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/python/testSrc/com/jetbrains/python/PyIndexingTest.java b/python/testSrc/com/jetbrains/python/PyIndexingTest.java index 7ccd14a787da..ee0dc0089f68 100644 --- a/python/testSrc/com/jetbrains/python/PyIndexingTest.java +++ b/python/testSrc/com/jetbrains/python/PyIndexingTest.java @@ -120,7 +120,16 @@ public class PyIndexingTest extends PyTestCase { m.clear(); for (ContentEntry e : entries) { - m.addContentEntry(e.getFile()); + final ContentEntry newEntry = m.addContentEntry(e.getFile()); + for (SourceFolder folder : e.getSourceFolders()) { + newEntry.addSourceFolder(folder.getFile(), folder.isTestSource()); + } + for (ExcludeFolder folder : e.getExcludeFolders()) { + newEntry.addExcludeFolder(folder.getFile()); + } + for (String pattern : e.getExcludePatterns()) { + newEntry.addExcludePattern(pattern); + } } ApplicationManager.getApplication().runWriteAction(() -> {