forked from leinardi/mypy-pycharm
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
16 changed files
with
298 additions
and
38 deletions.
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| #### [0.7.0] | ||
| - New: Added Scan Files Before Checkin | ||
| #### [0.5.0] | ||
| - New: Added real-time scanning! | ||
| #### [0.2.0] | ||
| - New: UX based on Checkstyle-IDEA plugin. | ||
| #### [0.2.0] | ||
| - New: Plugin id and name changed (please remove manually the old plugin). | ||
| #### [0.1.0] | ||
| - Initial release. |
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
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
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
194 changes: 194 additions & 0 deletions
194
src/main/java/com/leinardi/pycharm/pylint/handlers/ScanFilesBeforeCheckinHandler.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,194 @@ | ||
| /* | ||
| * Copyright 2018 Roberto Leinardi. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.leinardi.pycharm.pylint.handlers; | ||
|
|
||
| import com.intellij.CommonBundle; | ||
| import com.intellij.openapi.diagnostic.Logger; | ||
| import com.intellij.openapi.progress.ProcessCanceledException; | ||
| import com.intellij.openapi.progress.ProgressIndicator; | ||
| import com.intellij.openapi.progress.Task; | ||
| import com.intellij.openapi.project.Project; | ||
| import com.intellij.openapi.ui.Messages; | ||
| import com.intellij.openapi.vcs.CheckinProjectPanel; | ||
| import com.intellij.openapi.vcs.changes.CommitExecutor; | ||
| import com.intellij.openapi.vcs.checkin.CheckinHandler; | ||
| import com.intellij.openapi.vcs.ui.RefreshableOnComponent; | ||
| import com.intellij.psi.PsiFile; | ||
| import com.intellij.util.PairConsumer; | ||
| import com.intellij.util.ui.UIUtil; | ||
| import com.leinardi.pycharm.pylint.PylintConfigService; | ||
| import com.leinardi.pycharm.pylint.PylintPlugin; | ||
| import com.leinardi.pycharm.pylint.checker.Problem; | ||
| import com.leinardi.pycharm.pylint.toolwindow.PylintToolWindowPanel; | ||
| import org.jetbrains.annotations.NotNull; | ||
| import org.jetbrains.annotations.Nullable; | ||
|
|
||
| import javax.swing.JCheckBox; | ||
| import javax.swing.JComponent; | ||
| import javax.swing.JPanel; | ||
| import java.awt.BorderLayout; | ||
| import java.util.ArrayList; | ||
| import java.util.HashMap; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
|
|
||
| import static com.intellij.openapi.vcs.checkin.CheckinHandler.ReturnResult.CANCEL; | ||
| import static com.intellij.openapi.vcs.checkin.CheckinHandler.ReturnResult.CLOSE_WINDOW; | ||
| import static com.intellij.openapi.vcs.checkin.CheckinHandler.ReturnResult.COMMIT; | ||
| import static com.leinardi.pycharm.pylint.PylintBundle.message; | ||
| import static java.util.stream.Collectors.toList; | ||
|
|
||
| public class ScanFilesBeforeCheckinHandler extends CheckinHandler { | ||
| private static final Logger LOG = Logger.getInstance(ScanFilesBeforeCheckinHandler.class); | ||
|
|
||
| private final CheckinProjectPanel checkinPanel; | ||
| private final PylintConfigService pylintConfigService; | ||
|
|
||
| public ScanFilesBeforeCheckinHandler(@NotNull final CheckinProjectPanel myCheckinPanel) { | ||
| this.checkinPanel = myCheckinPanel; | ||
| pylintConfigService = PylintConfigService.getInstance(checkinPanel.getProject()); | ||
| } | ||
|
|
||
| @Nullable | ||
| @Override | ||
| public RefreshableOnComponent getBeforeCheckinConfigurationPanel() { | ||
| final JCheckBox checkBox = new JCheckBox(message("handler.before.checkin.checkbox")); | ||
|
|
||
| return new RefreshableOnComponent() { | ||
| @Override | ||
| public JComponent getComponent() { | ||
| final JPanel panel = new JPanel(new BorderLayout()); | ||
| panel.add(checkBox); | ||
| return panel; | ||
| } | ||
| @Override | ||
| public void refresh() { | ||
| } | ||
| @Override | ||
| public void saveState() { | ||
| pylintConfigService.setScanBeforeCheckin(checkBox.isSelected()); | ||
| } | ||
| @Override | ||
| public void restoreState() { | ||
| checkBox.setSelected(pylintConfigService.isScanBeforeCheckin()); | ||
| } | ||
| }; | ||
| } | ||
|
|
||
| @Override | ||
| public ReturnResult beforeCheckin(@Nullable final CommitExecutor executor, | ||
| final PairConsumer<Object, Object> additionalDataConsumer) { | ||
| final Project project = checkinPanel.getProject(); | ||
| if (project == null) { | ||
| LOG.warn("Could not get project for check-in panel, skipping"); | ||
| return COMMIT; | ||
| } | ||
|
|
||
| final PylintPlugin plugin = project.getComponent(PylintPlugin.class); | ||
| if (plugin == null) { | ||
| LOG.warn("Could not get Pylint Plug-in, skipping"); | ||
| return COMMIT; | ||
| } | ||
|
|
||
| if (pylintConfigService.isScanBeforeCheckin()) { | ||
| try { | ||
| final Map<PsiFile, List<Problem>> scanResults = new HashMap<>(); | ||
| new Task.Modal(project, message("handler.before.checkin.scan.text"), false) { | ||
| @Override | ||
| public void run(@NotNull final ProgressIndicator progressIndicator) { | ||
| progressIndicator.setText(message("handler.before.checkin.scan.in-progress")); | ||
| progressIndicator.setIndeterminate(true); | ||
| scanResults.putAll(plugin.scanFiles(new ArrayList<>(checkinPanel.getVirtualFiles()))); | ||
| } | ||
| }.queue(); | ||
|
|
||
| return processScanResults(scanResults, executor, plugin); | ||
|
|
||
| } catch (ProcessCanceledException e) { | ||
| return CANCEL; | ||
| } | ||
|
|
||
| } else { | ||
| return COMMIT; | ||
| } | ||
| } | ||
|
|
||
| private ReturnResult processScanResults(final Map<PsiFile, List<Problem>> results, | ||
| final CommitExecutor executor, | ||
| final PylintPlugin plugin) { | ||
| final int errorCount = errorCountOf(results); | ||
| if (errorCount == 0) { | ||
| return COMMIT; | ||
| } | ||
|
|
||
| final int answer = promptUser(plugin, errorCount, executor); | ||
| if (answer == Messages.OK) { | ||
| showResultsInToolWindow(results, plugin); | ||
| return CLOSE_WINDOW; | ||
|
|
||
| } else if (answer == Messages.CANCEL || answer < 0) { | ||
| return CANCEL; | ||
| } | ||
|
|
||
| return COMMIT; | ||
| } | ||
|
|
||
| private int errorCountOf(final Map<PsiFile, List<Problem>> results) { | ||
| return results.entrySet().stream() | ||
| .filter(this::hasProblemsThatAreNotIgnored) | ||
| .collect(toList()) | ||
| .size(); | ||
| } | ||
|
|
||
| private boolean hasProblemsThatAreNotIgnored(final Map.Entry<PsiFile, List<Problem>> entry) { | ||
| return entry.getValue().size() > 0; | ||
| } | ||
|
|
||
| private int promptUser(final PylintPlugin plugin, | ||
| final int errorCount, | ||
| final CommitExecutor executor) { | ||
| String commitButtonText; | ||
| if (executor != null) { | ||
| commitButtonText = executor.getActionText(); | ||
| } else { | ||
| commitButtonText = checkinPanel.getCommitActionName(); | ||
| } | ||
|
|
||
| if (commitButtonText.endsWith("...")) { | ||
| commitButtonText = commitButtonText.substring(0, commitButtonText.length() - 3); | ||
| } | ||
|
|
||
| final String[] buttons = new String[]{ | ||
| message("handler.before.checkin.error.review"), | ||
| commitButtonText, | ||
| CommonBundle.getCancelButtonText()}; | ||
|
|
||
| return Messages.showDialog(plugin.getProject(), message("handler.before.checkin.error.text", errorCount), | ||
| message("handler.before.checkin.error.title"), | ||
| buttons, 0, UIUtil.getWarningIcon()); | ||
| } | ||
|
|
||
| private void showResultsInToolWindow(final Map<PsiFile, List<Problem>> results, | ||
| final PylintPlugin plugin) { | ||
| final PylintToolWindowPanel toolWindowPanel = PylintToolWindowPanel.panelFor(plugin.getProject()); | ||
| if (toolWindowPanel != null) { | ||
| toolWindowPanel.displayResults(results); | ||
| toolWindowPanel.showToolWindow(); | ||
| } | ||
| } | ||
|
|
||
| } |
34 changes: 34 additions & 0 deletions
34
src/main/java/com/leinardi/pycharm/pylint/handlers/ScanFilesBeforeCheckinHandlerFactory.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| /* | ||
| * Copyright 2018 Roberto Leinardi. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.leinardi.pycharm.pylint.handlers; | ||
|
|
||
| import com.intellij.openapi.vcs.CheckinProjectPanel; | ||
| import com.intellij.openapi.vcs.changes.CommitContext; | ||
| import com.intellij.openapi.vcs.checkin.CheckinHandler; | ||
| import com.intellij.openapi.vcs.checkin.CheckinHandlerFactory; | ||
| import org.jetbrains.annotations.NotNull; | ||
|
|
||
| public class ScanFilesBeforeCheckinHandlerFactory extends CheckinHandlerFactory { | ||
|
|
||
| @NotNull | ||
| @Override | ||
| public CheckinHandler createHandler(@NotNull final CheckinProjectPanel checkinProjectPanel, | ||
| @NotNull final CommitContext commitContext) { | ||
| return new ScanFilesBeforeCheckinHandler(checkinProjectPanel); | ||
| } | ||
|
|
||
| } |
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
Oops, something went wrong.