Skip to content

Save Rider plugin settings globally #1766

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
martindisch wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Save Rider plugin settings globally #1766

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions Src/CSharpier.Rider/src/main/java/com/intellij/csharpier/CSharpierProcessProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,15 +271,15 @@ private ICSharpierProcess setupCSharpierProcess(String directory, String version
ICSharpierProcess csharpierProcess;
if (
Semver.gte(version, serverVersion) &&
!CSharpierSettings.getInstance(this.project).getDisableCSharpierServer()
!CSharpierSettings.getInstance().getDisableCSharpierServer()
) {
csharpierProcess = new CSharpierProcessServer(customPath, version, this.project);
} else if (Semver.gte(version, "0.12.0")) {
var useUtf8 = Semver.gte(version, "0.14.0");

if (
Semver.gte(version, serverVersion) &&
CSharpierSettings.getInstance(this.project).getDisableCSharpierServer()
CSharpierSettings.getInstance().getDisableCSharpierServer()
) {
this.logger.debug(
"CSharpier server is disabled, falling back to piping via stdin"
Expand Down
6 changes: 3 additions & 3 deletions Src/CSharpier.Rider/src/main/java/com/intellij/csharpier/CSharpierSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
package com.intellij.csharpier;

import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.components.PersistentStateComponent;
import com.intellij.openapi.components.State;
import com.intellij.openapi.components.Storage;
import com.intellij.openapi.project.Project;
import com.intellij.util.xmlb.XmlSerializerUtil;
import org.jetbrains.annotations.NotNull;

@State(name = "com.intellij.csharpier", storages = @Storage("CSharpierPlugin.xml"))
public class CSharpierSettings implements PersistentStateComponent<CSharpierSettings> {

@NotNull
static CSharpierSettings getInstance(@NotNull Project project) {
return project.getService(CSharpierSettings.class);
static CSharpierSettings getInstance() {
return ApplicationManager.getApplication().getService(CSharpierSettings.class);
}

private boolean runOnSave;
Expand Down
17 changes: 6 additions & 11 deletions Src/CSharpier.Rider/src/main/java/com/intellij/csharpier/CSharpierSettingsComponent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.intellij.csharpier;

import com.intellij.openapi.options.SearchableConfigurable;
import com.intellij.openapi.project.Project;
import com.intellij.ui.components.JBCheckBox;
import com.intellij.ui.components.JBLabel;
import com.intellij.ui.components.JBTextField;
Expand All @@ -14,15 +13,11 @@

public class CSharpierSettingsComponent implements SearchableConfigurable {

private final Project project;
private JBCheckBox runOnSaveCheckBox = new JBCheckBox("Run on Save");
private JBCheckBox disableCSharpierServerCheckBox = new JBCheckBox("Disable CSharpier Server");
private JBCheckBox useCustomPath = new JBCheckBox("Override CSharpier Executable");
private JBTextField customPathTextField = new JBTextField();

public CSharpierSettingsComponent(@NotNull Project project) {
this.project = project;
}

@NotNull
@Override
Expand Down Expand Up @@ -85,20 +80,20 @@ private JComponent createSectionHeader(String label) {
@Override
public boolean isModified() {
return (
CSharpierSettings.getInstance(this.project).getRunOnSave() !=
CSharpierSettings.getInstance().getRunOnSave() !=
this.runOnSaveCheckBox.isSelected() ||
CSharpierSettings.getInstance(this.project).getCustomPath() !=
CSharpierSettings.getInstance().getCustomPath() !=
this.customPathTextField.getText() ||
CSharpierSettings.getInstance(this.project).getUseCustomPath() !=
CSharpierSettings.getInstance().getUseCustomPath() !=
this.useCustomPath.isSelected() ||
CSharpierSettings.getInstance(this.project).getDisableCSharpierServer() !=
CSharpierSettings.getInstance().getDisableCSharpierServer() !=
this.disableCSharpierServerCheckBox.isSelected()
);
}

@Override
public void apply() {
var settings = CSharpierSettings.getInstance(this.project);
var settings = CSharpierSettings.getInstance();

settings.setRunOnSave(this.runOnSaveCheckBox.isSelected());
settings.setCustomPath(this.customPathTextField.getText());
Expand All @@ -108,7 +103,7 @@ public void apply() {

@Override
public void reset() {
var settings = CSharpierSettings.getInstance(this.project);
var settings = CSharpierSettings.getInstance();
this.runOnSaveCheckBox.setSelected(settings.getRunOnSave());
this.useCustomPath.setSelected(settings.getUseCustomPath());
this.customPathTextField.setText(settings.getCustomPath());
Expand Down
4 changes: 2 additions & 2 deletions Src/CSharpier.Rider/src/main/java/com/intellij/csharpier/CustomPathInstaller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ public class CustomPathInstaller {
String customPath;

public CustomPathInstaller(Project project) {
if (CSharpierSettings.getInstance(project).getUseCustomPath()) {
this.customPath = CSharpierSettings.getInstance(project).getCustomPath();
if (CSharpierSettings.getInstance().getUseCustomPath()) {
this.customPath = CSharpierSettings.getInstance().getCustomPath();
}

this.dotNetProvider = DotNetProvider.getInstance(project);
Expand Down
2 changes: 1 addition & 1 deletion ...rpier.Rider/src/main/java/com/intellij/csharpier/ReformatWithCSharpierOnSaveListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public void beforeDocumentSaving(@NotNull Document document) {
return;
}

var cSharpierSettings = CSharpierSettings.getInstance(project);
var cSharpierSettings = CSharpierSettings.getInstance();
if (!cSharpierSettings.getRunOnSave()) {
return;
}
Expand Down
4 changes: 2 additions & 2 deletions Src/CSharpier.Rider/src/main/resources/META-INF/plugin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
<projectService serviceImplementation="com.intellij.csharpier.CSharpierProcessProvider" />
<projectService serviceImplementation="com.intellij.csharpier.DotNetProvider" />
<projectService serviceImplementation="com.intellij.csharpier.FormattingService" />
<projectService serviceImplementation="com.intellij.csharpier.CSharpierSettings" />
<applicationService serviceImplementation="com.intellij.csharpier.CSharpierSettings" />
<projectService serviceImplementation="com.intellij.csharpier.InstallerService" />
<notificationGroup id="CSharpier" displayType="STICKY_BALLOON" />
<postStartupActivity implementation="com.intellij.csharpier.CSharpierStartup" />
<projectConfigurable
<applicationConfigurable
displayName="CSharpier"
parentId="tools"
id="com.intellij.csharpier.CSharpierSettingsComponent"
Expand Down