#7494 Move dialect rules from UI plugins to core

Former-commit-id: 4c523e31

plugins/org.jkiss.dbeaver.ext.mysql.ui/plugin.xml

@@ -131,12 +131,6 @@
         </editor>
     </extension>
 
-    <extension point="org.eclipse.core.runtime.adapters">
-        <factory adaptableType="org.jkiss.dbeaver.ext.mysql.model.MySQLDialect" class="org.jkiss.dbeaver.ext.mysql.ui.internal.MySQLDialectAdapterFactory">
-            <adapter type="org.jkiss.dbeaver.model.text.parser.TPRuleProvider"/>
-        </factory>
-    </extension>
-
     <extension point="org.jkiss.dbeaver.tools">
         <tools>
             <toolGroup

plugins/org.jkiss.dbeaver.ext.mysql/plugin.xml

@@ -303,6 +303,12 @@
         <command id="mysql.source" class="org.jkiss.dbeaver.ui.editors.sql.commands.SQLCommandInclude" label="Include" description="Include another MySQL script file"/>
     </extension>
 
+    <extension point="org.eclipse.core.runtime.adapters">
+        <factory adaptableType="org.jkiss.dbeaver.ext.mysql.model.MySQLDialect" class="org.jkiss.dbeaver.ext.mysql.sql.MySQLDialectAdapterFactory">
+            <adapter type="org.jkiss.dbeaver.model.text.parser.TPRuleProvider"/>
+        </factory>
+    </extension>
+
     <extension point="org.jkiss.dbeaver.dashboard">
 
         <mapQuery id="mysql.query.status" updatePeriod="1000">SHOW GLOBAL STATUS</mapQuery>

plugins/org.jkiss.dbeaver.ext.mysql.ui/src/org/jkiss/dbeaver/ext/mysql/ui/internal/MySQLDialectAdapterFactory.java → plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/sql/MySQLDialectAdapterFactory.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.jkiss.dbeaver.ext.mysql.ui.internal;
+package org.jkiss.dbeaver.ext.mysql.sql;
 
 import org.eclipse.core.runtime.IAdapterFactory;
 import org.jkiss.dbeaver.model.sql.SQLDialect;

plugins/org.jkiss.dbeaver.ext.mysql.ui/src/org/jkiss/dbeaver/ext/mysql/ui/internal/MySQLDialectRules.java → plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/sql/MySQLDialectRules.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jkiss.dbeaver.ext.mysql.ui.internal;
+package org.jkiss.dbeaver.ext.mysql.sql;
 
 import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;

plugins/org.jkiss.dbeaver.ext.oracle.ui/META-INF/MANIFEST.MF

@@ -16,7 +16,6 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.ui.editors,
  com.github.jsqlparser,
  org.jkiss.dbeaver.model,
- org.jkiss.dbeaver.model.sql,
  org.jkiss.dbeaver.registry,
  org.jkiss.dbeaver.ext.oracle,
  org.jkiss.dbeaver.ext.ui.locks,

plugins/org.jkiss.dbeaver.ext.oracle.ui/plugin.xml

@@ -303,12 +303,6 @@
         </tools>
     </extension>
 
-    <extension point="org.eclipse.core.runtime.adapters">
-        <factory adaptableType="org.jkiss.dbeaver.ext.oracle.model.OracleSQLDialect" class="org.jkiss.dbeaver.ext.oracle.ui.internal.OracleDialectAdapterFactory">
-            <adapter type="org.jkiss.dbeaver.model.text.parser.TPRuleProvider"/>
-        </factory>
-    </extension>
-
     <extension point="org.jkiss.dbeaver.task">
         <configurator type="oracle" class="org.jkiss.dbeaver.ext.oracle.ui.tools.OracleTaskConfigurator"/>
     </extension>

plugins/org.jkiss.dbeaver.ext.oracle/plugin.xml

@@ -364,7 +364,11 @@
             <adapter type="org.jkiss.dbeaver.ext.oracle.model.OracleProcedurePackaged"/>
             <adapter type="org.jkiss.dbeaver.ext.oracle.model.OracleSchedulerJob"/>
         </factory>
+        <factory adaptableType="org.jkiss.dbeaver.ext.oracle.model.OracleSQLDialect" class="org.jkiss.dbeaver.ext.oracle.sql.OracleDialectAdapterFactory">
+            <adapter type="org.jkiss.dbeaver.model.text.parser.TPRuleProvider"/>
+        </factory>
     </extension>
+
     <extension point="org.eclipse.ui.bindings">
         <key commandId="org.jkiss.dbeaver.ext.oracle.code.compile" schemeId="org.jkiss.dbeaver.defaultKeyScheme" sequence="CTRL+F9"/>
     </extension>

plugins/org.jkiss.dbeaver.ext.oracle.ui/src/org/jkiss/dbeaver/ext/oracle/ui/internal/OracleDialectAdapterFactory.java → plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/sql/OracleDialectAdapterFactory.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.jkiss.dbeaver.ext.oracle.ui.internal;
+package org.jkiss.dbeaver.ext.oracle.sql;
 
 import org.eclipse.core.runtime.IAdapterFactory;
 import org.jkiss.dbeaver.model.sql.SQLDialect;

plugins/org.jkiss.dbeaver.ext.oracle.ui/src/org/jkiss/dbeaver/ext/oracle/ui/internal/OracleDialectRules.java → plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/sql/OracleDialectRules.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jkiss.dbeaver.ext.oracle.ui.internal;
+package org.jkiss.dbeaver.ext.oracle.sql;
 
 import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;

plugins/org.jkiss.dbeaver.ext.postgresql.ui/META-INF/MANIFEST.MF

@@ -17,7 +17,6 @@ Require-Bundle: org.eclipse.osgi.services,
  org.eclipse.ui.editors,
  org.eclipse.gef,
  org.jkiss.dbeaver.model,
- org.jkiss.dbeaver.model.sql,
  org.jkiss.dbeaver.registry,
  org.jkiss.dbeaver.ext.postgresql,
  org.jkiss.dbeaver.ext.generic,

plugins/org.jkiss.dbeaver.ext.postgresql.ui/plugin.xml

@@ -275,12 +275,6 @@
         <configurator type="postgresql" class="org.jkiss.dbeaver.ext.postgresql.tools.PostgreTaskConfigurator"/>
     </extension>
 
-    <extension point="org.eclipse.core.runtime.adapters">
-        <factory adaptableType="org.jkiss.dbeaver.ext.postgresql.model.PostgreDialect" class="org.jkiss.dbeaver.ext.postgresql.ui.sql.PostgreDialectAdapterFactory">
-            <adapter type="org.jkiss.dbeaver.model.text.parser.TPRuleProvider"/>
-        </factory>
-    </extension>
-
     <extension point="org.eclipse.ui.preferencePages">
         <page category="org.jkiss.dbeaver.preferences.drivers" id="org.jkiss.dbeaver.preferences.postgresql.general" class="org.jkiss.dbeaver.ext.postgresql.ui.PrefPagePostgreSQL" name="PostgreSQL">
             <keywordReference id="org.jkiss.dbeaver.core.keyword.dbeaver"/>

plugins/org.jkiss.dbeaver.ext.postgresql/plugin.xml

@@ -508,6 +508,12 @@
         </provider>
     </extension>
 
+    <extension point="org.eclipse.core.runtime.adapters">
+        <factory adaptableType="org.jkiss.dbeaver.ext.postgresql.model.PostgreDialect" class="org.jkiss.dbeaver.ext.postgresql.sql.PostgreDialectAdapterFactory">
+            <adapter type="org.jkiss.dbeaver.model.text.parser.TPRuleProvider"/>
+        </factory>
+    </extension>
+
     <extension point="org.jkiss.dbeaver.networkHandler">
         <handler
                 type="config"

plugins/org.jkiss.dbeaver.ext.postgresql.ui/src/org/jkiss/dbeaver/ext/postgresql/ui/sql/PostgreDialectAdapterFactory.java → plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/sql/PostgreDialectAdapterFactory.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.jkiss.dbeaver.ext.postgresql.ui.sql;
+package org.jkiss.dbeaver.ext.postgresql.sql;
 
 import org.eclipse.core.runtime.IAdapterFactory;
 import org.jkiss.dbeaver.model.sql.SQLDialect;

plugins/org.jkiss.dbeaver.ext.postgresql.ui/src/org/jkiss/dbeaver/ext/postgresql/ui/sql/PostgreDialectRules.java → plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/sql/PostgreDialectRules.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jkiss.dbeaver.ext.postgresql.ui.sql;
+package org.jkiss.dbeaver.ext.postgresql.sql;
 
 import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;

plugins/org.jkiss.dbeaver.ext.postgresql.ui/src/org/jkiss/dbeaver/ext/postgresql/ui/sql/PostgreDollarQuoteRule.java → plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/sql/PostgreDollarQuoteRule.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jkiss.dbeaver.ext.postgresql.ui.sql;
+package org.jkiss.dbeaver.ext.postgresql.sql;
 
 import org.eclipse.jface.text.rules.ICharacterScanner;
 import org.jkiss.dbeaver.ext.postgresql.PostgreConstants;

plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/syntax/SQLTokenAdapter.java

@@ -65,7 +65,7 @@ public class SQLTokenAdapter extends Token {
                         return new TextAttribute(scanner.getColor(SQLConstants.CONFIG_COLOR_DELIMITER), null, scanner.getKeywordStyle());
                     case T_CONTROL:
                     case T_SET_DELIMITER:
-                        return new TextAttribute(scanner.getColor(SQLConstants.CONFIG_COLOR_COMMAND), null, SWT.NORMAL);
+                        return new TextAttribute(scanner.getColor(SQLConstants.CONFIG_COLOR_COMMAND), null, scanner.getKeywordStyle());
                     case T_PARAMETER:
                     case T_VARIABLE:
                         return new TextAttribute(scanner.getColor(SQLConstants.CONFIG_COLOR_PARAMETER), null, scanner.getKeywordStyle());