MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-06 03:21:12 +07:00
Code Issues Packages Projects Releases Wiki Activity

[json] IJPL-157406 Fix presentable schema version name

Browse Source 
GitOrigin-RevId: 6ad3686198090f9ac42d49e9e1fae73181d7abaa
This commit is contained in:
Nikita Katkov
2024-07-08 18:06:03 +02:00
committed by intellij-monorepo-bot
parent 383df78317
commit d524aec751
2 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
json/resources/messages/JsonBundle.properties
View File

@@ -138,7 +138,7 @@ color.page.attribute.parameter=Parameter
qualified.name.qualified=qualified name
qualified.name.pointer=JSON pointer
schema.of.version=JSON Schema version {0}
schema.of.version=JSON Schema {0}
schema.configuration.error.empty.file.path=Empty file path matches nothing
schema.configuration.error.empty.pattern=Empty pattern matches nothing

22
json/src/com/jetbrains/jsonSchema/settings/mappings/JsonSchemaMappingsView.java
View File

@@ -20,14 +20,12 @@ import com.intellij.openapi.ui.popup.JBPopupFactory;
import com.intellij.openapi.ui.popup.PopupStep;
import com.intellij.openapi.ui.popup.util.BaseListPopupStep;
import com.intellij.openapi.util.NlsContexts.PopupContent;
import com.intellij.openapi.util.NlsSafe;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.ui.AnActionButton;
import com.intellij.ui.AnActionButtonRunnable;
import com.intellij.ui.DocumentAdapter;
import com.intellij.ui.ToolbarDecorator;
import com.intellij.ui.*;
import com.intellij.ui.awt.RelativePoint;
import com.intellij.ui.components.JBLabel;
import com.intellij.ui.components.JBTextField;
@@ -148,6 +146,9 @@ public final class JsonSchemaMappingsView implements Disposable {
schemaSelector.setBorder(JBUI.Borders.emptyRight(10));
JBLabel versionLabel = new JBLabel(JsonBundle.message("json.schema.version.selector.title"));
mySchemaVersionComboBox = new ComboBox<>(new DefaultComboBoxModel<>(JsonSchemaVersion.values()));
mySchemaVersionComboBox.setRenderer(
SimpleListCellRenderer.create((presentation, value, index) -> { presentation.setText(getPresentableSchemaName(value)); })
);
versionLabel.setLabelFor(mySchemaVersionComboBox);
versionLabel.setBorder(JBUI.Borders.empty(0, 10));
builder.addLabeledComponent(versionLabel, mySchemaVersionComboBox);
@@ -351,4 +352,17 @@ public final class JsonSchemaMappingsView implements Disposable {
}
}
}
private static @NlsSafe String getPresentableSchemaName(@Nullable JsonSchemaVersion version) {
if (version == null) return "unknown";
var versionSuffix = switch (version) {
case SCHEMA_4 -> "v4";
case SCHEMA_6 -> "v6";
case SCHEMA_7 -> "v7";
case SCHEMA_2019_09 -> "2019.09";
case SCHEMA_2020_12 -> "2020.12";
};
return JsonBundle.message("schema.of.version", versionSuffix);
}
}