Skip to content

Commit c4ba0b6

Browse files
sebthommickaelistria
authored andcommitted
fix: replace term CodeLens with Code Minings in XML preferences
1 parent 2eefbe3 commit c4ba0b6

File tree

7 files changed

+44
-44
lines changed

7 files changed

+44
-44
lines changed

org.eclipse.wildwebdeveloper.xml/plugin.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ providerName=Eclipse Wild Web Developer project
1515
XMLPreferencePage.name=XML (Wild Web Developer)
1616
XMLCatalogPreferencePage.name=Catalogs
1717
XMLCatalogPreferencePage.preferenceKeywords.xmlcatalog=xml catalog entries
18-
XMLCodeLensPreferencePage.name=CodeLens
19-
XMLCodeLensPreferencePage.preferenceKeywords.xmlcodelens=xml codelens
18+
XMLCodeMiningsPreferencePage.name=Code Minings
19+
XMLCodeMiningsPreferencePage.preferenceKeywords.xmlcodeminings=xml codeminings
2020
XMLFormattingPreferencePage.name=Formatting
2121
XMLFormattingPreferencePage.preferenceKeywords.xmlformatting=xml formatting
2222
XMLValidationPreferencePage.name=Validation & Resolution

org.eclipse.wildwebdeveloper.xml/plugin.xml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
</reconciler>
3131
</extension>
3232

33-
<!-- XML Language -->
33+
<!-- XML Language -->
3434
<extension
3535
point="org.eclipse.core.contenttype.contentTypes">
3636
<content-type
@@ -69,7 +69,7 @@
6969
priority="low">
7070
</content-type>
7171
</extension>
72-
72+
7373
<extension
7474
point="org.eclipse.lsp4e.languageServer">
7575
<server
@@ -99,9 +99,9 @@
9999
<contentTypeMapping
100100
contentType="org.eclipse.wildwebdeveloper.rng"
101101
id="org.eclipse.wildwebdeveloper.xml">
102-
</contentTypeMapping>
102+
</contentTypeMapping>
103103
</extension>
104-
104+
105105
<extension
106106
point="org.eclipse.tm4e.registry.grammars">
107107
<grammar
@@ -129,15 +129,15 @@
129129
scopeName="source.rnc">
130130
</scopeNameContentTypeBinding>
131131
</extension>
132-
132+
133133
<extension
134134
point="org.eclipse.tm4e.languageconfiguration.languageConfigurations">
135135
<languageConfiguration
136136
contentTypeId="org.eclipse.wildwebdeveloper.rnc"
137137
path="language-configurations/rnc/rnc.language-configuration.json">
138138
</languageConfiguration>
139139
</extension>
140-
140+
141141
<extension
142142
point="org.eclipse.tm4e.ui.snippets">
143143
<snippet
@@ -153,7 +153,7 @@
153153
icon="icons/xmlEditorIcon.png">
154154
</icon>
155155
</extension>
156-
156+
157157
<extension
158158
point="org.eclipse.ui.preferencePages">
159159
<page
@@ -170,10 +170,10 @@
170170
</page>
171171
<page
172172
category="org.eclipse.wildwebdeveloper.xml.internal.ui.preferences.XMLPreferencePage"
173-
class="org.eclipse.wildwebdeveloper.xml.internal.ui.preferences.XMLCodeLensPreferencePage"
174-
id="org.eclipse.wildwebdeveloper.xml.internal.ui.preferences.XMLCodeLensPreferencePage"
175-
name="%XMLCodeLensPreferencePage.name">
176-
<keywordReference id="org.eclipse.wildwebdeveloper.xml.ui.xmlcodelens"/>
173+
class="org.eclipse.wildwebdeveloper.xml.internal.ui.preferences.XMLCodeMiningsPreferencePage"
174+
id="org.eclipse.wildwebdeveloper.xml.internal.ui.preferences.XMLCodeMiningsPreferencePage"
175+
name="%XMLCodeMiningsPreferencePage.name">
176+
<keywordReference id="org.eclipse.wildwebdeveloper.xml.ui.xmlcodeminings"/>
177177
</page>
178178
<page
179179
category="org.eclipse.wildwebdeveloper.xml.internal.ui.preferences.XMLPreferencePage"
@@ -190,35 +190,35 @@
190190
<keywordReference id="org.eclipse.wildwebdeveloper.xml.ui.xmlvalidation"/>
191191
</page>
192192
</extension>
193-
193+
194194
<!-- Keywords for preference and properties pages -->
195195
<extension point="org.eclipse.ui.keywords">
196196
<keyword
197197
label="%XMLCatalogPreferencesPage.preferenceKeywords.xmlcatalog"
198198
id="org.eclipse.wildwebdeveloper.xml.ui.xmlcatalogs"/>
199199
<keyword
200-
label="%XMLCodeLensPreferencesPage.preferenceKeywords.xmlcodelens"
201-
id="org.eclipse.wildwebdeveloper.xml.ui.xmlcodelens"/>
200+
label="%XMLCodeMiningsPreferencesPage.preferenceKeywords.xmlcodeminings"
201+
id="org.eclipse.wildwebdeveloper.xml.ui.xmlcodeminings"/>
202202
<keyword
203-
label="%XMLCodeLensPreferencesPage.preferenceKeywords.xmlformatting"
203+
label="%XMLFormattingPreferencesPage.preferenceKeywords.xmlformatting"
204204
id="org.eclipse.wildwebdeveloper.xml.ui.xmlformatting"/>
205205
<keyword
206206
label="%XMLValidationPreferencesPage.preferenceKeywords.xmlvalidation"
207-
id="org.eclipse.wildwebdeveloper.xml.ui.xmlvalidation"/>
207+
id="org.eclipse.wildwebdeveloper.xml.ui.xmlvalidation"/>
208208
</extension>
209-
209+
210210
<extension
211211
point="org.eclipse.core.runtime.preferences">
212212
<initializer
213213
class="org.eclipse.wildwebdeveloper.xml.internal.ui.preferences.XMLPreferenceInitializer">
214214
</initializer>
215215
</extension>
216-
216+
217217
<extension
218218
point="org.eclipse.ui.handlers">
219219
<handler
220220
class="org.eclipse.wildwebdeveloper.xml.internal.commands.AssociateGrammarHandler"
221-
commandId="xml.open.binding.wizard">
222-
</handler>
221+
commandId="xml.open.binding.wizard">
222+
</handler>
223223
</extension>
224224
</plugin>

org.eclipse.wildwebdeveloper.xml/src/org/eclipse/wildwebdeveloper/xml/internal/ui/Messages.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ public class Messages extends NLS {
2727
public static String XMLCatalogPreferencePage_OpenInEditorMessage;
2828
public static String XMLCatalogPreferencePage_OpenInEditorApplyAndEdit;
2929

30-
// --------- XML CodeLens preference page
31-
public static String XMLCodelensPreferencePage_codelens_enabled;
30+
// --------- XML CodeMinings preference page
31+
public static String XMLCodeMiningsPreferencePage_codeminings_enabled;
3232

3333
// --------- XML Formatting preference page
3434
public static String XMLFormattingPreferencePage_format_maxLineWidth;
@@ -56,7 +56,7 @@ public class Messages extends NLS {
5656
public static String XMLFormattingPreferencePage_format_preserveSpace;
5757
public static String XMLFormattingPreferencePage_format_joinCommentLines;
5858
public static String XMLFormattingPreferencePage_format_joinCDATALines;
59-
59+
6060
public static String PreserveSpaceFieldEditor_inputDialog_description;
6161
public static String PreserveSpaceFieldEditor_inputDialog_title;
6262

@@ -72,7 +72,7 @@ public class Messages extends NLS {
7272
public static String XMLValidationPreferencePage_validation_namespace_option_onNamespaceEncountered;
7373
public static String XMLValidationPreferencePage_validation_schema_option_onValidSchema;
7474
public static String XMLValidationPreferencePage_validation_noGrammar_option_hint;
75-
75+
7676
// --------- Associate Grammar Dialog
7777
public static String AssociateGrammarDialog_title;
7878
public static String AssociateGrammarDialog_grammar_field;
@@ -86,7 +86,7 @@ public class Messages extends NLS {
8686
public static String Add_button;
8787
public static String Remove_button;
8888
public static String Browse_button;
89-
89+
9090
static {
9191
NLS.initializeMessages("org.eclipse.wildwebdeveloper.xml.internal.ui.messages", Messages.class); //$NON-NLS-1$
9292
}

org.eclipse.wildwebdeveloper.xml/src/org/eclipse/wildwebdeveloper/xml/internal/ui/messages.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ XMLCatalogPreferencePage_OpenInEditorTitle=Open XML Catalog in editor
2222
XMLCatalogPreferencePage_OpenInEditorMessage=Do you want to Apply the changes and open the selected XML Catalog in editor?
2323
XMLCatalogPreferencePage_OpenInEditorApplyAndEdit=Apply and Edit
2424

25-
# XML CodeLens preference page
26-
XMLCodelensPreferencePage_codelens_enabled=Enable XML &CodeLens
25+
# XML Minings preference page
26+
XMLCodeMiningsPreferencePage_codeminings_enabled=Enable XML &Code Minings
2727

2828
# XML Formatting preference page
2929
XMLFormattingPreferencePage_format_emptyElements=Expand/collapse &empty elements
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*******************************************************************************/
1313
package org.eclipse.wildwebdeveloper.xml.internal.ui.preferences;
1414

15-
import static org.eclipse.wildwebdeveloper.xml.internal.ui.preferences.XMLPreferenceServerConstants.XML_PREFERENCES_CODELENS_ENABLED;
15+
import static org.eclipse.wildwebdeveloper.xml.internal.ui.preferences.XMLPreferenceServerConstants.XML_PREFERENCES_CODEMININGS_ENABLED;
1616

1717
import org.eclipse.jface.preference.BooleanFieldEditor;
1818
import org.eclipse.jface.preference.FieldEditorPreferencePage;
@@ -25,16 +25,16 @@
2525
* XML code lens preference page.
2626
*
2727
*/
28-
public class XMLCodeLensPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {
28+
public class XMLCodeMiningsPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {
2929

30-
public XMLCodeLensPreferencePage() {
30+
public XMLCodeMiningsPreferencePage() {
3131
super(GRID);
3232
}
3333

3434
@Override
3535
public void createFieldEditors() {
36-
addField(new BooleanFieldEditor(XML_PREFERENCES_CODELENS_ENABLED.preferenceId,
37-
Messages.XMLCodelensPreferencePage_codelens_enabled, getFieldEditorParent()));
36+
addField(new BooleanFieldEditor(XML_PREFERENCES_CODEMININGS_ENABLED.preferenceId,
37+
Messages.XMLCodeMiningsPreferencePage_codeminings_enabled, getFieldEditorParent()));
3838
}
3939

4040
@Override

org.eclipse.wildwebdeveloper.xml/src/org/eclipse/wildwebdeveloper/xml/internal/ui/preferences/XMLPreferenceInitializer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
import static org.eclipse.wildwebdeveloper.xml.internal.ui.preferences.XMLPreferenceClientConstants.XML_PREFERENCES_COMPLETION_AUTO_CLOSE_TAGS;
1515
import static org.eclipse.wildwebdeveloper.xml.internal.ui.preferences.XMLPreferenceServerConstants.XML_PREFERENCES_CATAGLOGS;
16-
import static org.eclipse.wildwebdeveloper.xml.internal.ui.preferences.XMLPreferenceServerConstants.XML_PREFERENCES_CODELENS_ENABLED;
16+
import static org.eclipse.wildwebdeveloper.xml.internal.ui.preferences.XMLPreferenceServerConstants.XML_PREFERENCES_CODEMININGS_ENABLED;
1717
import static org.eclipse.wildwebdeveloper.xml.internal.ui.preferences.XMLPreferenceServerConstants.XML_PREFERENCES_DOWNLOAD_EXTERNAL_RESOURCES;
1818
import static org.eclipse.wildwebdeveloper.xml.internal.ui.preferences.XMLPreferenceServerConstants.XML_PREFERENCES_FOLDING_INCLUDE_CLOSING_TAG_IN_FOLD;
1919
import static org.eclipse.wildwebdeveloper.xml.internal.ui.preferences.XMLPreferenceServerConstants.XML_PREFERENCES_FORMAT_CLOSING_BRACKET_NEW_LINE;
@@ -76,7 +76,7 @@ public void initializeDefaultPreferences() {
7676
// Server settings
7777
STORE.setDefault(XML_PREFERENCES_DOWNLOAD_EXTERNAL_RESOURCES.preferenceId, false);
7878
STORE.setDefault(XML_PREFERENCES_CATAGLOGS.preferenceId, "");
79-
STORE.setDefault(XML_PREFERENCES_CODELENS_ENABLED.preferenceId, true);
79+
STORE.setDefault(XML_PREFERENCES_CODEMININGS_ENABLED.preferenceId, true);
8080
STORE.setDefault(XML_PREFERENCES_FOLDING_INCLUDE_CLOSING_TAG_IN_FOLD.preferenceId, true);
8181

8282
STORE.setDefault(XML_PREFERENCES_FORMAT_MAX_LINE_WIDTH.preferenceId, 80);

org.eclipse.wildwebdeveloper.xml/src/org/eclipse/wildwebdeveloper/xml/internal/ui/preferences/XMLPreferenceServerConstants.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public static class LemminxPreference {
3333
public final String preferenceId;
3434
/**
3535
* without the "xml" prefix
36-
*
36+
*
3737
* @see https://github.com/redhat-developer/vscode-xml#supported-vs-code-settings
3838
*/
3939
public final String lemminxOptionPath;
@@ -74,8 +74,8 @@ public void storeToLemminxOptions(Object value, Map<String, Object> options) {
7474
// Catalog settings
7575
public static final LemminxPreference XML_PREFERENCES_CATAGLOGS = new LemminxPreference("catalogs");
7676

77-
// CodeLens settings
78-
public static final LemminxPreference XML_PREFERENCES_CODELENS_ENABLED = new LemminxPreference("codeLens/enabled");
77+
// Code Minings (CodeLens) settings
78+
public static final LemminxPreference XML_PREFERENCES_CODEMININGS_ENABLED = new LemminxPreference("codeLens/enabled");
7979

8080
// Folding settings
8181
public static final LemminxPreference XML_PREFERENCES_FOLDING_INCLUDE_CLOSING_TAG_IN_FOLD = new LemminxPreference(
@@ -148,7 +148,7 @@ public void storeToLemminxOptions(Object value, Map<String, Object> options) {
148148
private static final LemminxPreference[] ALL_LEMMINX_PREFERENCES = { //
149149
XML_PREFERENCES_DOWNLOAD_EXTERNAL_RESOURCES, //
150150
XML_PREFERENCES_CATAGLOGS, //
151-
XML_PREFERENCES_CODELENS_ENABLED, //
151+
XML_PREFERENCES_CODEMININGS_ENABLED, //
152152
XML_PREFERENCES_FOLDING_INCLUDE_CLOSING_TAG_IN_FOLD, //
153153
XML_PREFERENCES_FORMAT_MAX_LINE_WIDTH, //
154154
XML_PREFERENCES_FORMAT_GRAMMAR_AWARE_FORMATTING, //
@@ -192,8 +192,8 @@ public static void storePreferencesToLemminxOptions(IPreferenceStore store, Map<
192192
XML_PREFERENCES_CATAGLOGS.storeToLemminxOptions(
193193
XMLCatalogs.getAllCatalogs(store).stream().map(File::getAbsolutePath).toArray(String[]::new), xmlOpts);
194194

195-
// CodeLens settings
196-
setAsBoolean(XML_PREFERENCES_CODELENS_ENABLED, store, xmlOpts);
195+
// Code Minings settings
196+
setAsBoolean(XML_PREFERENCES_CODEMININGS_ENABLED, store, xmlOpts);
197197

198198
// Folding settings
199199
setAsBoolean(XML_PREFERENCES_FOLDING_INCLUDE_CLOSING_TAG_IN_FOLD, store, xmlOpts);
@@ -232,10 +232,10 @@ private static void setAsString(LemminxPreference preference, IPreferenceStore s
232232
}
233233

234234
private static void setAsArrayString(LemminxPreference preference, IPreferenceStore store, Map<String, Object> xmlOpts) {
235-
String value = store.getString(preference.preferenceId);
235+
String value = store.getString(preference.preferenceId);
236236
preference.storeToLemminxOptions(value.split(","), xmlOpts);
237237
}
238-
238+
239239
private static void setAsBoolean(LemminxPreference preference, IPreferenceStore store,
240240
Map<String, Object> xmlOpts) {
241241
preference.storeToLemminxOptions(store.getBoolean(preference.preferenceId), xmlOpts);

0 commit comments

Comments
 (0)