Skip to content

Fix SwitchBase class init error: fetch AppSettingsState on-demand #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Sun-Phil-Kwon-Miro wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix SwitchBase class init error: fetch AppSettingsState on-demand #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions src/main/java/switcher/intellij/actions/SwitchBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

public abstract class SwitchBase extends AnAction implements DumbAware {
private static final Logger LOG = Logger.getInstance("SidePanelSwitcher");
private static final AppSettingsState settings = AppSettingsState.getInstance();
private static AppSettingsState settings() { return AppSettingsState.getInstance(); }
protected ToolWindowAnchor anchor;

@Override
Expand Down Expand Up @@ -76,14 +76,14 @@ private void show(List<ToolWindow> toolWindows) {
LOG.debug("Trying to show window: [" + toolWindow.getId() + "]; on the: [" + anchor.toString() + "] side");
}

if (!settings.rememberLastOpened
if (!settings().rememberLastOpened
|| lastShownToolWindowIds == null
|| lastShownToolWindowIds.size() == 0
|| lastShownToolWindowIds.stream().anyMatch(str -> str.equals(toolWindow.getId()))) {
toolWindow.show(null);
}

if (settings.focusOnSwitched
if (settings().focusOnSwitched
&& toolWindow.getId().equals(lastFocusedToolWindowId)){
toolWindow.activate(null);
}
Expand All @@ -97,24 +97,24 @@ private boolean canBeSwitched(ToolWindow toolWindow) {
if (toolWindow.getType() == ToolWindowType.DOCKED && !toolWindow.isAutoHide())
return true;

return (settings.switchDockUnpinned && toolWindow.getType() == ToolWindowType.DOCKED && toolWindow.isAutoHide())
|| (settings.switchUndocked && toolWindow.getType() == ToolWindowType.SLIDING)
|| (settings.switchFloat && toolWindow.getType() == ToolWindowType.FLOATING);
return (settings().switchDockUnpinned && toolWindow.getType() == ToolWindowType.DOCKED && toolWindow.isAutoHide())
|| (settings().switchUndocked && toolWindow.getType() == ToolWindowType.SLIDING)
|| (settings().switchFloat && toolWindow.getType() == ToolWindowType.FLOATING);
}

private List<String> getLastShownToolWindows() {
return settings.lastShownToolWindows.get(anchor.toString());
return settings().lastShownToolWindows.get(anchor.toString());
}

private void setLastShownToolWindows(List<String> toolWindowIds) {
settings.lastShownToolWindows.put(anchor.toString(), toolWindowIds);
settings().lastShownToolWindows.put(anchor.toString(), toolWindowIds);
}

private String removeLastFocusedToolWindow() {
return settings.lastFocusedToolWindow.remove(anchor.toString());
return settings().lastFocusedToolWindow.remove(anchor.toString());
}

private void setLastFocusedToolWindow(String toolWindowId) {
settings.lastFocusedToolWindow.put(anchor.toString(), toolWindowId);
settings().lastFocusedToolWindow.put(anchor.toString(), toolWindowId);
}
}