Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
c6f28272
D
dbeaver
项目概览
suliangchun
/
dbeaver
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dbeaver
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
c6f28272
编写于
2月 13, 2017
作者:
S
Serge Rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
SQL syntax rules code cleanup
上级
35f71abc
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
50 addition
and
26 deletion
+50
-26
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditorSourceViewerConfiguration.java
...er/ui/editors/sql/SQLEditorSourceViewerConfiguration.java
+14
-22
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/syntax/SQLRuleManager.java
...g/jkiss/dbeaver/ui/editors/sql/syntax/SQLRuleManager.java
+1
-1
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/syntax/tokens/SQLControlToken.java
...dbeaver/ui/editors/sql/syntax/tokens/SQLControlToken.java
+34
-0
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/syntax/tokens/SQLFileIncludeToken.java
...ver/ui/editors/sql/syntax/tokens/SQLFileIncludeToken.java
+1
-3
未找到文件。
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditorSourceViewerConfiguration.java
浏览文件 @
c6f28272
...
...
@@ -260,7 +260,6 @@ public class SQLEditorSourceViewerConfiguration extends TextSourceViewerConfigur
@Override
public
IPresentationReconciler
getPresentationReconciler
(
ISourceViewer
sourceViewer
)
{
// Create a presentation reconciler to handle handle document changes.
PresentationReconciler
reconciler
=
new
PresentationReconciler
();
String
docPartitioning
=
getConfiguredDocumentPartitioning
(
sourceViewer
);
...
...
@@ -275,34 +274,27 @@ public class SQLEditorSourceViewerConfiguration extends TextSourceViewerConfigur
// rule for multiline comments
// We just need a scanner that does nothing but returns a token with
// the corresponding text attributes
dr
=
new
DefaultDamagerRepairer
(
new
SingleTokenScanner
(
new
TextAttribute
(
ruleManager
.
getColor
(
SQLConstants
.
CONFIG_COLOR_COMMENT
))));
reconciler
.
setDamager
(
dr
,
SQLPartitionScanner
.
CONTENT_TYPE_SQL_MULTILINE_COMMENT
);
reconciler
.
setRepairer
(
dr
,
SQLPartitionScanner
.
CONTENT_TYPE_SQL_MULTILINE_COMMENT
);
addContentTypeDamageRepairer
(
reconciler
,
SQLPartitionScanner
.
CONTENT_TYPE_SQL_MULTILINE_COMMENT
,
SQLConstants
.
CONFIG_COLOR_COMMENT
);
// Add a "damager-repairer" for changes within one-line SQL comments.
dr
=
new
DefaultDamagerRepairer
(
new
SingleTokenScanner
(
new
TextAttribute
(
ruleManager
.
getColor
(
SQLConstants
.
CONFIG_COLOR_COMMENT
))));
reconciler
.
setDamager
(
dr
,
SQLPartitionScanner
.
CONTENT_TYPE_SQL_COMMENT
);
reconciler
.
setRepairer
(
dr
,
SQLPartitionScanner
.
CONTENT_TYPE_SQL_COMMENT
);
addContentTypeDamageRepairer
(
reconciler
,
SQLPartitionScanner
.
CONTENT_TYPE_SQL_COMMENT
,
SQLConstants
.
CONFIG_COLOR_COMMENT
);
// Add a "damager-repairer" for changes within quoted literals.
dr
=
new
DefaultDamagerRepairer
(
new
SingleTokenScanner
(
new
TextAttribute
(
ruleManager
.
getColor
(
SQLConstants
.
CONFIG_COLOR_STRING
))));
reconciler
.
setDamager
(
dr
,
SQLPartitionScanner
.
CONTENT_TYPE_SQL_STRING
);
reconciler
.
setRepairer
(
dr
,
SQLPartitionScanner
.
CONTENT_TYPE_SQL_STRING
);
addContentTypeDamageRepairer
(
reconciler
,
SQLPartitionScanner
.
CONTENT_TYPE_SQL_STRING
,
SQLConstants
.
CONFIG_COLOR_STRING
);
// Add a "damager-repairer" for changes within quoted literals.
dr
=
new
DefaultDamagerRepairer
(
new
SingleTokenScanner
(
new
TextAttribute
(
ruleManager
.
getColor
(
SQLConstants
.
CONFIG_COLOR_DATATYPE
))));
reconciler
.
setDamager
(
dr
,
SQLPartitionScanner
.
CONTENT_TYPE_SQL_QUOTED
);
reconciler
.
setRepairer
(
dr
,
SQLPartitionScanner
.
CONTENT_TYPE_SQL_QUOTED
);
addContentTypeDamageRepairer
(
reconciler
,
SQLPartitionScanner
.
CONTENT_TYPE_SQL_QUOTED
,
SQLConstants
.
CONFIG_COLOR_DATATYPE
);
return
reconciler
;
}
private
void
addContentTypeDamageRepairer
(
PresentationReconciler
reconciler
,
String
contentType
,
String
colorId
)
{
DefaultDamagerRepairer
dr
=
new
DefaultDamagerRepairer
(
new
SingleTokenScanner
(
new
TextAttribute
(
ruleManager
.
getColor
(
colorId
))));
reconciler
.
setDamager
(
dr
,
contentType
);
reconciler
.
setRepairer
(
dr
,
contentType
);
}
/**
* Returns the SQLEditor associated with this object.
*
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/syntax/SQLRuleManager.java
浏览文件 @
c6f28272
...
...
@@ -181,9 +181,9 @@ public class SQLRuleManager extends RuleBasedScanner {
rules
.
add
(
new
MultiLineRule
(
SQLConstants
.
STR_QUOTE_DOUBLE
,
SQLConstants
.
STR_QUOTE_DOUBLE
,
quotedToken
,
(
char
)
0
));
}
// Add rules for multi-line comments
Pair
<
String
,
String
>
multiLineComments
=
dialect
.
getMultiLineComments
();
if
(
multiLineComments
!=
null
)
{
// Add rules for multi-line comments
rules
.
add
(
new
MultiLineRule
(
multiLineComments
.
getFirst
(),
multiLineComments
.
getSecond
(),
commentToken
,
(
char
)
0
,
true
));
}
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/syntax/tokens/SQLControlToken.java
0 → 100644
浏览文件 @
c6f28272
/*
* DBeaver - Universal Database Manager
* Copyright (C) 2010-2017 Serge Rider (serge@jkiss.org)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.jkiss.dbeaver.ui.editors.sql.syntax.tokens
;
import
org.eclipse.jface.text.rules.Token
;
/**
* SQLControlToken
*
* Control tokens are used for local SQL script evaluation.
*/
public
abstract
class
SQLControlToken
extends
Token
{
public
SQLControlToken
(
Object
data
)
{
super
(
data
);
}
}
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/syntax/tokens/SQLFileIncludeToken.java
浏览文件 @
c6f28272
...
...
@@ -17,14 +17,12 @@
package
org.jkiss.dbeaver.ui.editors.sql.syntax.tokens
;
import
org.eclipse.jface.text.rules.Token
;
/**
* SQLFileIncludeToken
*
* @author Serge Rider
*/
public
class
SQLFileIncludeToken
extends
Token
{
public
class
SQLFileIncludeToken
extends
SQLControl
Token
{
public
SQLFileIncludeToken
(
Object
data
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录