Skip to content

Fixing compilation errors after platform update #99

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

Merged
VISTALL merged 1 commit into from
Oct 15, 2026
Merged

Fixing compilation errors after platform update #99

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
18 changes: 10 additions & 8 deletions dotnet-api/src/main/java/consulo/dotnet/module/extension/DotNetConfigurationPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package consulo.dotnet.module.extension;

import consulo.annotation.access.RequiredReadAction;
Expand Down Expand Up @@ -59,7 +58,7 @@

/**
* @author VISTALL
* @since 31.07.14
* @since 2014-07-31
*/
public final class DotNetConfigurationPanel {
private DotNetConfigurationPanel() {
Expand Down Expand Up @@ -171,11 +170,14 @@ protected void doAdd(AnActionEvent e) {
return null;
})
.showAsync(listBox)
.whenCompleteAsync((value, error) -> {
if (error == null && !StringUtil.isEmpty(value) && model.indexOf(value) < 0) {
model.add(value);
}
}, uiAccess);
.whenCompleteAsync(
(value, error) -> {
if (error == null && !StringUtil.isEmpty(value) && model.indexOf(value) < 0) {
model.add(value);
}
},
uiAccess
);
}
})
.build();
Expand All @@ -199,7 +201,7 @@ private static ComboBox<DotNetMainTypeItem> createMainTypeBox(

MutableFlatDataModel<DotNetMainTypeItem> model = FlatDataModel.of(initialItems);
ComboBox<DotNetMainTypeItem> mainTypeBox = ComboBox.create(model);
mainTypeBox.setRender((presentation, item) -> {
mainTypeBox.setRenderer((presentation, item) -> {
DotNetMainTypeItem value = item.getValue();
String qualifiedName = value == null ? null : value.qualifiedName();
if (value == null || qualifiedName == null) {
Expand Down
2 changes: 1 addition & 1 deletion ...pl/src/main/java/consulo/dotnet/debugger/impl/runner/remote/DotNetRemoteConfigurable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public DotNetRemoteConfigurable(Project project) {
myPortField = IntBox.create().withRange(0, MAX_PORT);

myModuleComboBox = ComboBox.create(ModuleManager.getInstance(project).getSortedModules());
myModuleComboBox.setRender((presentation, item) -> {
myModuleComboBox.setRenderer((presentation, item) -> {
Module module = item.getValue();
if (module == null) {
presentation.append(DotNetExecutionLocalize.runConfigurationModuleNone());
Expand Down
7 changes: 2 additions & 5 deletions ...et-execution-impl/src/main/java/consulo/dotnet/run/impl/DotNetProgramParametersPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package consulo.dotnet.run.impl;

import consulo.application.Application;
import consulo.dotnet.execution.localize.DotNetExecutionLocalize;
import consulo.dotnet.module.extension.DotNetRunModuleExtension;
import consulo.execution.ui.CommonProgramParametersLayout;
Expand Down Expand Up @@ -41,8 +40,7 @@ protected void addAfter(FormBuilder builder) {
}

ComboBox<Module> moduleComboBox = ComboBox.create(modules);
moduleComboBox.setRender((presentation, item) ->
{
moduleComboBox.setRenderer((presentation, item) -> {
Module module = item.getValue();
if (module != null) {
presentation.withIcon(PlatformIconGroup.nodesModule());
Expand All @@ -54,8 +52,7 @@ protected void addAfter(FormBuilder builder) {
builder.addLabeled(DotNetExecutionLocalize.runConfigurationModuleLabel(), moduleComboBox);

ComboBox<ProcessConsoleType> consoleTypeBox = ComboBox.create(ProcessConsoleType.listSupported());
consoleTypeBox.setRender((presentation, item) ->
{
consoleTypeBox.setRenderer((presentation, item) -> {
ProcessConsoleType consoleType = item.getValue();
if (consoleType != null) {
presentation.append(consoleType.getDisplayName());
Expand Down
168 changes: 78 additions & 90 deletions ...mpl/src/main/java/consulo/dotnet/run/impl/coverage/DotNetCoverageConfigurationEditor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package consulo.dotnet.run.impl.coverage;

import consulo.configurable.ConfigurationException;
Expand All @@ -38,94 +37,83 @@

/**
* @author VISTALL
* @since 10.01.15
* @since 2015-01-10
*/
public class DotNetCoverageConfigurationEditor extends SettingsEditor<DotNetConfigurationWithCoverage>
{
private static final Object NO_RUNNER = new Object();

private final MutableFlatDataModel<Object> myRunnersModel = FlatDataModel.of(List.of(NO_RUNNER));
private final ComboBox<Object> myRunnersBox;
private final CheckBox myEnabledCheckBox;

@RequiredUIAccess
public DotNetCoverageConfigurationEditor()
{
myEnabledCheckBox = CheckBox.create(DotNetExecutionLocalize.coverageEnabledCheckbox());

myRunnersBox = ComboBox.create(myRunnersModel);
myRunnersBox.setRender((presentation, item) ->
{
Object value = item.getValue();
if(value == null || value == NO_RUNNER)
{
presentation.append(DotNetExecutionLocalize.coverageNoRunner());
}
else if(value instanceof String runnerId)
{
presentation.append(runnerId, TextAttribute.ERROR);
}
else if(value instanceof CoverageRunner coverageRunner)
{
presentation.append(coverageRunner.getPresentableName());
}
});
}

@Override
@RequiredUIAccess
protected void resetEditorFrom(DotNetConfigurationWithCoverage s)
{
CoverageEnabledConfiguration coverageEnabledConfiguration = DotNetCoverageEnabledConfiguration.getOrCreate((RunConfigurationBase) s);

myEnabledCheckBox.setValue(coverageEnabledConfiguration.isCoverageEnabled());

List<Object> runners = new ArrayList<>();
runners.add(NO_RUNNER);
runners.addAll(DotNetCoverageRunner.findAvailableRunners(s));

Object selected = NO_RUNNER;
CoverageRunner coverageRunner = coverageEnabledConfiguration.getCoverageRunner();
if(coverageRunner != null)
{
selected = coverageRunner;
}
else if(coverageEnabledConfiguration.getRunnerId() != null)
{
selected = coverageEnabledConfiguration.getRunnerId();
runners.add(selected);
}

myRunnersModel.replaceAll(runners);
myRunnersBox.setValue(selected);
}

@Override
@RequiredUIAccess
protected void applyEditorTo(DotNetConfigurationWithCoverage s) throws ConfigurationException
{
CoverageEnabledConfiguration coverageEnabledConfiguration = DotNetCoverageEnabledConfiguration.getOrCreate((RunConfigurationBase) s);

coverageEnabledConfiguration.setCoverageEnabled(Boolean.TRUE.equals(myEnabledCheckBox.getValue()));

Object selectedItem = myRunnersBox.getValue();
if(selectedItem instanceof CoverageRunner coverageRunner)
{
coverageEnabledConfiguration.setCoverageRunner(coverageRunner);
}
else if(selectedItem == null || selectedItem == NO_RUNNER)
{
coverageEnabledConfiguration.setCoverageRunner(null);
}
}

@Override
@RequiredUIAccess
protected Component createUIComponent()
{
VerticalLayout layout = VerticalLayout.create();
layout.add(myEnabledCheckBox);
layout.add(FormBuilder.create().addLabeled(DotNetExecutionLocalize.coverageRunnerLabel(), myRunnersBox).build());
return layout;
}
public class DotNetCoverageConfigurationEditor extends SettingsEditor<DotNetConfigurationWithCoverage> {
private static final Object NO_RUNNER = new Object();

private final MutableFlatDataModel<Object> myRunnersModel = FlatDataModel.of(List.of(NO_RUNNER));
private final ComboBox<Object> myRunnersBox;
private final CheckBox myEnabledCheckBox;

@RequiredUIAccess
public DotNetCoverageConfigurationEditor() {
myEnabledCheckBox = CheckBox.create(DotNetExecutionLocalize.coverageEnabledCheckbox());

myRunnersBox = ComboBox.create(myRunnersModel);
myRunnersBox.setRenderer((presentation, item) -> {
Object value = item.getValue();
if (value == null || value == NO_RUNNER) {
presentation.append(DotNetExecutionLocalize.coverageNoRunner());
}
else if (value instanceof String runnerId) {
presentation.append(runnerId, TextAttribute.ERROR);
}
else if (value instanceof CoverageRunner coverageRunner) {
presentation.append(coverageRunner.getPresentableName());
}
});
}

@Override
@RequiredUIAccess
protected void resetEditorFrom(DotNetConfigurationWithCoverage s) {
CoverageEnabledConfiguration coverageEnabledConfiguration =
DotNetCoverageEnabledConfiguration.getOrCreate((RunConfigurationBase) s);

myEnabledCheckBox.setValue(coverageEnabledConfiguration.isCoverageEnabled());

List<Object> runners = new ArrayList<>();
runners.add(NO_RUNNER);
runners.addAll(DotNetCoverageRunner.findAvailableRunners(s));

Object selected = NO_RUNNER;
CoverageRunner coverageRunner = coverageEnabledConfiguration.getCoverageRunner();
if (coverageRunner != null) {
selected = coverageRunner;
}
else if (coverageEnabledConfiguration.getRunnerId() != null) {
selected = coverageEnabledConfiguration.getRunnerId();
runners.add(selected);
}

myRunnersModel.replaceAll(runners);
myRunnersBox.setValue(selected);
}

@Override
@RequiredUIAccess
protected void applyEditorTo(DotNetConfigurationWithCoverage s) throws ConfigurationException {
CoverageEnabledConfiguration coverageEnabledConfiguration =
DotNetCoverageEnabledConfiguration.getOrCreate((RunConfigurationBase) s);

coverageEnabledConfiguration.setCoverageEnabled(Boolean.TRUE.equals(myEnabledCheckBox.getValue()));

Object selectedItem = myRunnersBox.getValue();
if (selectedItem instanceof CoverageRunner coverageRunner) {
coverageEnabledConfiguration.setCoverageRunner(coverageRunner);
}
else if (selectedItem == null || selectedItem == NO_RUNNER) {
coverageEnabledConfiguration.setCoverageRunner(null);
}
}

@Override
@RequiredUIAccess
protected Component createUIComponent() {
VerticalLayout layout = VerticalLayout.create();
layout.add(myEnabledCheckBox);
layout.add(FormBuilder.create().addLabeled(DotNetExecutionLocalize.coverageRunnerLabel(), myRunnersBox).build());
return layout;
}
}
52 changes: 25 additions & 27 deletions ...src/main/java/consulo/dotnet/impl/roots/orderEntry/DotNetLibraryOrderEntryTypeEditor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,48 +13,46 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package consulo.dotnet.impl.roots.orderEntry;

import consulo.annotation.component.ExtensionImpl;
import consulo.application.AllIcons;
import consulo.dotnet.module.extension.DotNetLibraryOrderEntryModel;
import consulo.dotnet.module.extension.DotNetSimpleModuleExtension;
import consulo.ide.setting.module.CustomOrderEntryTypeEditor;
import consulo.module.content.layer.ModuleExtensionProvider;
import consulo.module.content.layer.orderEntry.CustomOrderEntry;
import consulo.platform.base.icon.PlatformIconGroup;
import consulo.ui.ex.ColoredTextContainer;
import consulo.ui.image.Image;

import java.util.function.Consumer;

/**
* @author VISTALL
* @since 06-Jun-16
* @since 2016-06-06
*/
@ExtensionImpl
public class DotNetLibraryOrderEntryTypeEditor implements CustomOrderEntryTypeEditor<DotNetLibraryOrderEntryModel>
{
@Override
public Consumer<ColoredTextContainer> getRender(CustomOrderEntry<DotNetLibraryOrderEntryModel> orderEntry, DotNetLibraryOrderEntryModel model)
{
return it -> {

DotNetSimpleModuleExtension extension = orderEntry.getModuleRootLayer().getExtension(DotNetSimpleModuleExtension.class);

ModuleExtensionProvider<?> provider = extension == null ? null : ModuleExtensionProvider.findProvider(extension.getId());

Image icon = provider == null ? AllIcons.Toolbar.Unknown : provider.getIcon();

it.append(model.getPresentableName());

it.setIcon(icon);
};
}

@Override
public String getOrderTypeId()
{
return "dot-net-library";
}
public class DotNetLibraryOrderEntryTypeEditor implements CustomOrderEntryTypeEditor<DotNetLibraryOrderEntryModel> {
@Override
public Consumer<ColoredTextContainer> getRenderer(
CustomOrderEntry<DotNetLibraryOrderEntryModel> orderEntry,
DotNetLibraryOrderEntryModel model
) {
return it -> {
DotNetSimpleModuleExtension extension = orderEntry.getModuleRootLayer().getExtension(DotNetSimpleModuleExtension.class);

ModuleExtensionProvider<?> provider = extension == null ? null : ModuleExtensionProvider.findProvider(extension.getId());

Image icon = provider == null ? PlatformIconGroup.toolbarUnknown() : provider.getIcon();

it.append(model.getPresentableName());

it.setIcon(icon);
};
}

@Override
public String getOrderTypeId() {
return "dot-net-library";
}
}
Loading