Don't retreive pants options in Event Dispatch Thread #476
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
FileChangeTracker methods are always called in Event Dispatch Thread. Pants Plugin implementation sometimes needs to retrieve pants options in order to decide, whether to mark project as dirty. Unfortunatly, Pants Options are retrieved via an external process call, what is forbidden in the Event Dispatch Thread. In this commit, the bahvior of the listener is changed in that way, the pants options are retrieved before the listener is initialized, on a thread from thread pool, and they're passed to listener's constructor. Unfortunately, pants options may be read only when a project contains any modules. Therefore, it we can't just read them at `projectOpened` stage, because the project may be initially empty. That's why we register a ModuleListener in case when the project is empty. Fixes #463
lukaszwawrzyk
approved these changes
Jan 13, 2020
| return new VirtualFileListener() { | ||
|
|
||
| void markDirty(VirtualFile file) { |
| import java.util.Collection; | ||
| import java.util.Collections; | ||
| import java.util.List; | ||
| import java.util.Optional; |
There was a problem hiding this comment.
All these new imports are suspicious as there are no further changes in this file
| @@ -104,10 +104,10 @@ public FileChangeTracker getInstance() { | |||
| return instance; | |||
| } | |||
|
|
|||
| private static void markDirty(@NotNull VirtualFile file, @NotNull VirtualFileListener listener) { | |||
| private static void markDirty(@NotNull VirtualFile file,final PantsOptions pantsOptions, @NotNull VirtualFileListener listener) { | |||
There was a problem hiding this comment.
You can run formatter on this file
|
|
||
| /** | ||
| * VSF tracker implementation requires PantsOptions object, that cannot be constructed in | ||
| * the Event Dispatch Thread. What is more, it can't be constructed if the project contain |
| * needed: | ||
| * 1. When the Pants project is opened and it already contains modules - then we can register tracker immediately | ||
| * 2. When the Pants project is opened, but modules are not loaded yet - then we have to wait until a module is loaded | ||
| * @param project |
| * @param project | ||
| */ | ||
| private void registerVfsListener(Project project) { | ||
| if(ModuleManager.getInstance(project).getModules().length > 0) { |
There was a problem hiding this comment.
Also run formatter on this file
added 2 commits
January 13, 2020 14:38
1. makeDirty marked private 2. removed unused import 3. formatter run some files
wisechengyi
approved these changes
Jan 14, 2020
| @@ -3,6 +3,7 @@ | |||
|
|
|||
| package com.twitter.intellij.pants.service.project.metadata; | |||
|
|
|||
| import com.intellij.openapi.application.ApplicationManager; | |||
There was a problem hiding this comment.
no change in this file.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
FileChangeTracker methods are always called in Event Dispatch Thread.
Pants Plugin implementation sometimes needs to retrieve pants options
in order to decide, whether to mark project as dirty. Unfortunatly,
Pants Options are retrieved via an external process call, what is
forbidden in the Event Dispatch Thread.
In this commit, the bahvior of the listener is changed in that way,
the pants options are retrieved before the listener is initialized,
on a thread from thread pool, and they're passed to listener's
constructor.
Unfortunately, pants options may be read only when a project
contains any modules. Therefore, it we can't just read them at
projectOpenedstage, because the project may be initially empty.That's why we register a ModuleListener in case when the project is
empty.
Fixes #463