[nobug] change missing line style provider message to a warning
diff --git a/web/bundles/org.eclipse.jst.jsp.ui/META-INF/MANIFEST.MF b/web/bundles/org.eclipse.jst.jsp.ui/META-INF/MANIFEST.MF
index 1045366..0191277 100755
--- a/web/bundles/org.eclipse.jst.jsp.ui/META-INF/MANIFEST.MF
+++ b/web/bundles/org.eclipse.jst.jsp.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jst.jsp.ui; singleton:=true
-Bundle-Version: 1.3.0.qualifier
+Bundle-Version: 1.3.100.qualifier
Bundle-Activator: org.eclipse.jst.jsp.ui.internal.JSPUIPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/web/bundles/org.eclipse.jst.jsp.ui/plugin.xml b/web/bundles/org.eclipse.jst.jsp.ui/plugin.xml
index 839cc8a..6f2eb51 100755
--- a/web/bundles/org.eclipse.jst.jsp.ui/plugin.xml
+++ b/web/bundles/org.eclipse.jst.jsp.ui/plugin.xml
@@ -21,9 +21,11 @@
name="%CSS_JSP_Source_Page_Editor.name"
icon="$nl$/icons//full/obj16/sourceEditor.gif"
contributorClass="org.eclipse.jst.jsp.ui.internal.editor.ActionContributorJSP"
- class="org.eclipse.wst.sse.ui.StructuredTextEditor"
symbolicFontName="org.eclipse.wst.sse.ui.textfont"
id="org.eclipse.jst.jsp.core.cssjspsource.source">
+ <class class="org.eclipse.wst.sse.ui.StructuredTextEditor">
+ <parameter name="org.eclipse.wst.sse.ui.appearancePreferenceScopeName" value="org.eclipse.jst.jsp.ui"/>
+ </class>
<contentTypeBinding
contentTypeId="org.eclipse.jst.jsp.core.cssjspsource" />
<contentTypeBinding
diff --git a/web/bundles/org.eclipse.jst.jsp.ui/pom.xml b/web/bundles/org.eclipse.jst.jsp.ui/pom.xml
index 89bd470..1853cea 100644
--- a/web/bundles/org.eclipse.jst.jsp.ui/pom.xml
+++ b/web/bundles/org.eclipse.jst.jsp.ui/pom.xml
@@ -21,6 +21,6 @@
<groupId>org.eclipse.webtools.sourceediting</groupId>
<artifactId>org.eclipse.jst.jsp.ui</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/web/bundles/org.eclipse.wst.html.ui/META-INF/MANIFEST.MF b/web/bundles/org.eclipse.wst.html.ui/META-INF/MANIFEST.MF
index 9dd81ef..160ef03 100755
--- a/web/bundles/org.eclipse.wst.html.ui/META-INF/MANIFEST.MF
+++ b/web/bundles/org.eclipse.wst.html.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.wst.html.ui; singleton:=true
-Bundle-Version: 1.1.400.qualifier
+Bundle-Version: 1.1.500.qualifier
Bundle-Activator: org.eclipse.wst.html.ui.internal.HTMLUIPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/web/bundles/org.eclipse.wst.html.ui/pom.xml b/web/bundles/org.eclipse.wst.html.ui/pom.xml
index c3c1b21..98030b1 100644
--- a/web/bundles/org.eclipse.wst.html.ui/pom.xml
+++ b/web/bundles/org.eclipse.wst.html.ui/pom.xml
@@ -21,6 +21,6 @@
<groupId>org.eclipse.webtools.sourceediting</groupId>
<artifactId>org.eclipse.wst.html.ui</artifactId>
- <version>1.1.400-SNAPSHOT</version>
+ <version>1.1.500-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/web/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/StructuredTextViewerConfigurationHTML.java b/web/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/StructuredTextViewerConfigurationHTML.java
index 5f4d456..b77a635 100644
--- a/web/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/StructuredTextViewerConfigurationHTML.java
+++ b/web/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/StructuredTextViewerConfigurationHTML.java
@@ -46,6 +46,7 @@
import org.eclipse.wst.html.ui.internal.style.LineStyleProviderForHTML;
import org.eclipse.wst.sse.core.text.IStructuredPartitions;
import org.eclipse.wst.sse.ui.StructuredTextViewerConfiguration;
+import org.eclipse.wst.sse.ui.internal.ExtendedConfigurationBuilder;
import org.eclipse.wst.sse.ui.internal.format.StructuredFormattingStrategy;
import org.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider;
import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
@@ -235,7 +236,14 @@
providers = new LineStyleProvider[]{getLineStyleProviderForEmbeddedCSS()};
}
else {
- Logger.log(Logger.INFO, "No line style provider for " + partitionType);
+ ExtendedConfigurationBuilder builder = ExtendedConfigurationBuilder.getInstance();
+ LineStyleProvider provider = (LineStyleProvider) builder.getConfiguration("linestyleprovider", partitionType);
+ if (provider != null) {
+ providers = new LineStyleProvider[]{provider};
+ }
+ else {
+ Logger.log(Logger.WARNING_DEBUG, "No line style provider for " + partitionType);
+ }
}
return providers;
diff --git a/web/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/text/correction/RemoveAttributesProposal.java b/web/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/text/correction/RemoveAttributesProposal.java
index 8ee7aab..cffb763 100644
--- a/web/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/text/correction/RemoveAttributesProposal.java
+++ b/web/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/text/correction/RemoveAttributesProposal.java
@@ -47,15 +47,14 @@
if (fTag.getNumberOfRegions() > 2) {
int removalStart = fTag.getTextEndOffset(regions.get(1));
int removalEnd = fTag.getStartOffset(fTag.getLastRegion());
- if (!isEndType(fTag.getLastRegion().getType())) {
- removalEnd = removalStart;
- }
- try {
- document.replace(removalStart, removalEnd - removalStart, "");
- }
- catch (BadLocationException e) {
- Logger.logException(e);
- }
+// if (isEndType(fTag.getLastRegion().getType())) {
+ try {
+ document.replace(removalStart, removalEnd - removalStart, "");
+ }
+ catch (BadLocationException e) {
+ Logger.logException(e);
+ }
+// }
}
}
diff --git a/web/features/org.eclipse.wst.web_js_support.feature/feature.xml b/web/features/org.eclipse.wst.web_js_support.feature/feature.xml
index 47431f9..0f781e5 100644
--- a/web/features/org.eclipse.wst.web_js_support.feature/feature.xml
+++ b/web/features/org.eclipse.wst.web_js_support.feature/feature.xml
@@ -14,7 +14,7 @@
<feature
id="org.eclipse.wst.web_js_support.feature"
label="%featureName"
- version="3.19.0.qualifier"
+ version="3.20.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/web/features/org.eclipse.wst.web_js_support.feature/pom.xml b/web/features/org.eclipse.wst.web_js_support.feature/pom.xml
index f470296..4e5ef4b 100644
--- a/web/features/org.eclipse.wst.web_js_support.feature/pom.xml
+++ b/web/features/org.eclipse.wst.web_js_support.feature/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.eclipse.webtools.sourceediting</groupId>
<artifactId>org.eclipse.wst.web_js_support.feature</artifactId>
- <version>3.19.0-SNAPSHOT</version>
+ <version>3.20.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<build>
diff --git a/web/features/org.eclipse.wst.web_js_support_sdk.feature/feature.xml b/web/features/org.eclipse.wst.web_js_support_sdk.feature/feature.xml
index 4e031f4..554ef0b 100644
--- a/web/features/org.eclipse.wst.web_js_support_sdk.feature/feature.xml
+++ b/web/features/org.eclipse.wst.web_js_support_sdk.feature/feature.xml
@@ -14,7 +14,7 @@
<feature
id="org.eclipse.wst.web_js_support_sdk.feature"
label="%featureName"
- version="3.19.0.qualifier"
+ version="3.20.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/web/features/org.eclipse.wst.web_js_support_sdk.feature/pom.xml b/web/features/org.eclipse.wst.web_js_support_sdk.feature/pom.xml
index 2f849ec..b0810a2 100644
--- a/web/features/org.eclipse.wst.web_js_support_sdk.feature/pom.xml
+++ b/web/features/org.eclipse.wst.web_js_support_sdk.feature/pom.xml
@@ -21,6 +21,6 @@
<groupId>org.eclipse.webtools.sourceediting</groupId>
<artifactId>org.eclipse.wst.web_js_support_sdk.feature</artifactId>
- <version>3.19.0-SNAPSHOT</version>
+ <version>3.20.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
