#248 Source viewer config fix (use default text editor settings)

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditorBase.java

@@ -107,7 +107,7 @@ public abstract class SQLEditorBase extends BaseTextEditor {
         PlatformUI.getWorkbench().getThemeManager().addPropertyChangeListener(themeListener);
 
         setDocumentProvider(new SQLDocumentProvider());
-        setSourceViewerConfiguration(new SQLEditorSourceViewerConfiguration(this));
+        setSourceViewerConfiguration(new SQLEditorSourceViewerConfiguration(this, getPreferenceStore()));
         setKeyBindingScopes(new String[]{"org.eclipse.ui.textEditorScope", "org.jkiss.dbeaver.ui.editors.sql"});  //$NON-NLS-1$
     }
 

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditorSourceViewerConfiguration.java

@@ -17,6 +17,7 @@
  */
 package org.jkiss.dbeaver.ui.editors.sql;
 
+import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.text.*;
 import org.eclipse.jface.text.contentassist.ContentAssistant;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
@@ -88,9 +89,9 @@ public class SQLEditorSourceViewerConfiguration extends TextSourceViewerConfigur
      * @param editor the SQLEditor to configure
      */
     public SQLEditorSourceViewerConfiguration(
-        SQLEditorBase editor)
+        SQLEditorBase editor, IPreferenceStore preferenceStore)
     {
-        super(EditorsPlugin.getDefault().getPreferenceStore());
+        super(preferenceStore);
         this.editor = editor;
         this.ruleManager = editor.getRuleManager();
         this.completionProcessor = new SQLCompletionProcessor(editor);

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/templates/SQLTemplatesPage.java

@@ -17,7 +17,6 @@
  */
 package org.jkiss.dbeaver.ui.editors.sql.templates;
 
-import org.jkiss.dbeaver.Log;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.text.*;
 import org.eclipse.jface.text.source.ISourceViewer;
@@ -31,8 +30,10 @@ import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
+import org.eclipse.ui.internal.editors.text.EditorsPlugin;
 import org.eclipse.ui.part.IPageSite;
 import org.eclipse.ui.texteditor.templates.AbstractTemplatesPage;
+import org.jkiss.dbeaver.Log;
 import org.jkiss.dbeaver.core.DBeaverCore;
 import org.jkiss.dbeaver.model.DBPDataSource;
 import org.jkiss.dbeaver.registry.driver.DriverDescriptor;
@@ -163,7 +164,7 @@ public class SQLTemplatesPage extends AbstractTemplatesPage {
     {
         IDocument document = new Document();
         SQLEditorSourceViewer viewer = new SQLEditorSourceViewer(parent, null, null, false, SWT.V_SCROLL | SWT.H_SCROLL);
-        SQLEditorSourceViewerConfiguration configuration = new SQLEditorSourceViewerConfiguration(sqlEditor);
+        SQLEditorSourceViewerConfiguration configuration = new SQLEditorSourceViewerConfiguration(sqlEditor, EditorsPlugin.getDefault().getPreferenceStore());
         viewer.configure(configuration);
         viewer.setEditable(false);
         viewer.setDocument(document);