This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 6f2056b492 Lookup CSS properties case-insensitive
new c9065c0b5a Merge pull request #4986 from
matthiasblaesing/css_case_insensitive_properties
6f2056b492 is described below
commit 6f2056b4929fc2089418b487defec1b4150efefa
Author: Matthias Bläsing <mblaes...@doppel-helix.eu>
AuthorDate: Fri Nov 18 22:57:12 2022 +0100
Lookup CSS properties case-insensitive
Closes: #4861
---
.../modules/css/editor/module/main/BrowserSupportModule.java | 7 ++++++-
.../modules/css/editor/module/main/DefaultCssEditorModule.java | 8 ++++++--
.../modules/css/editor/module/main/ExtCssEditorModule.java | 7 ++++++-
.../css/editor/module/main/properties/PropertiesATest.java | 7 +++++++
4 files changed, 25 insertions(+), 4 deletions(-)
diff --git
a/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/BrowserSupportModule.java
b/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/BrowserSupportModule.java
index 4757fe5a66..57eecc2102 100644
---
a/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/BrowserSupportModule.java
+++
b/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/BrowserSupportModule.java
@@ -66,7 +66,12 @@ public class BrowserSupportModule extends CssEditorModule
implements CssModule {
@Override
public PropertyDefinition getPropertyDefinition(String propertyName) {
- return parser.getVendorSpecificProperties().get(propertyName);
+ PropertyDefinition pd =
parser.getVendorSpecificProperties().get(propertyName);
+ if (pd != null || propertyName == null) {
+ return pd;
+ } else {
+ return
parser.getVendorSpecificProperties().get(propertyName.toLowerCase());
+ }
}
@Override
diff --git
a/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/DefaultCssEditorModule.java
b/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/DefaultCssEditorModule.java
index 8b63bd8fee..a3147145d7 100644
---
a/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/DefaultCssEditorModule.java
+++
b/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/DefaultCssEditorModule.java
@@ -36,7 +36,6 @@ import javax.swing.text.BadLocationException;
import javax.swing.text.Document;
import org.netbeans.api.lexer.Token;
import org.netbeans.api.lexer.TokenSequence;
-import org.netbeans.api.lexer.TokenUtilities;
import org.netbeans.lib.editor.util.CharSequenceUtilities;
import org.netbeans.modules.csl.api.ColoringAttributes;
import org.netbeans.modules.csl.api.CompletionProposal;
@@ -189,7 +188,12 @@ public class DefaultCssEditorModule extends
CssEditorModule {
@Override
public PropertyDefinition getPropertyDefinition(String propertyName) {
- return getProperties().get(propertyName);
+ PropertyDefinition pd = getProperties().get(propertyName);
+ if (pd != null || propertyName == null) {
+ return pd;
+ } else {
+ return getProperties().get(propertyName.toLowerCase());
+ }
}
@Override
diff --git
a/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/ExtCssEditorModule.java
b/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/ExtCssEditorModule.java
index e451ce6124..07866cac69 100644
---
a/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/ExtCssEditorModule.java
+++
b/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/ExtCssEditorModule.java
@@ -53,6 +53,11 @@ public abstract class ExtCssEditorModule extends
CssEditorModule {
@Override
public PropertyDefinition getPropertyDefinition(String propertyName) {
//Note: the context param is ignored by the "standard" css editor
modules.
- return getProperties().get(propertyName);
+ PropertyDefinition pd = getProperties().get(propertyName);
+ if (pd != null || propertyName == null) {
+ return pd;
+ } else {
+ return getProperties().get(propertyName.toLowerCase());
+ }
}
}
diff --git
a/ide/css.editor/test/unit/src/org/netbeans/modules/css/editor/module/main/properties/PropertiesATest.java
b/ide/css.editor/test/unit/src/org/netbeans/modules/css/editor/module/main/properties/PropertiesATest.java
index f2a92baa7a..f384cb2f08 100644
---
a/ide/css.editor/test/unit/src/org/netbeans/modules/css/editor/module/main/properties/PropertiesATest.java
+++
b/ide/css.editor/test/unit/src/org/netbeans/modules/css/editor/module/main/properties/PropertiesATest.java
@@ -2769,4 +2769,11 @@ public class PropertiesATest extends CssModuleTestBase {
assertCssCode(".demo {grid: auto-flow 1fr / repeat(auto-fill, 5em);}");
assertCssCode(".demo {grid: auto 1fr auto / repeat(5, 1fr);}");
}
+
+ public void testCaseSensitivity() throws Exception {
+ assertCssCode("h1 { border-style: dashed; border-width: 1rem; }");
+ assertCssCode("h1 { border-style: dAsHeD; border-width: 1ReM; }");
+ assertCssCode("h1 { BORDER-STYLE: dashed }");
+ assertCssCode("h1 { bOrDeR-sTyLe: dashed }");
+ }
}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
