jyapayne/ace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

more progress

Browse source
This commit is contained in:
sevin7676 2015-04-17 08:37:54 -04:00
commit 461faa9184
3 changed files with 40 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

42
demo/kitchen-sink/docs/sqlserver.sqlserver
View file

@ -1,22 +1,24 @@
CREATE VIEW V_Orders -- =============================================
-- Author: Morgan Yarbrough
-- Create date: 4/27/2015
-- Description: Test Procedure that shows off language features.
-- Includes non-standard folding using region comments using either
-- line comments or block comments (both are demonstrated below)
-- =============================================
CREATE PROCEDURE dbo.TestProcedure
--#region parameters
@vint INT = 1;
--#endregion
AS AS
SELECT BEGIN
-- SET NOCOUNT ON added to prevent extra result sets from
--#region Orders -- interfering with SELECT statements.
Orders.OrderID SET NOCOUNT ON;
,Orders.CustomerID
,Orders.OrderDate
--#endregion
/*#region Customers*/ SELECT Orders.OrderID, Customers.CompanyName, DATEFROMPARTS(YEAR(GETDATE()), 1, 1) AS FirstDayOfYear
,Customers.CompanyName FROM Orders
,Customers.ContactName INNER JOIN Customers
/*#endregion*/ ON Orders.CustomerID = Customers.CustomerID
END
--#region Other
,DATEFROMPARTS(YEAR(GETDATE()), 1, 1) AS FirstDayOfYear
--#endregion
FROM Orders
INNER JOIN Customers
ON Orders.CustomerID = Customers.CustomerID

3
lib/ace/mode/sqlserver_highlight_rules.js
View file

@ -131,6 +131,9 @@ var SqlServerHighlightRules = function() {
}, { }, {
token : keywordMapper, token : keywordMapper,
regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b" regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
}, {
token : "constant.class",
regex : "@@?[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
}, { }, {
token : "keyword.operator", token : "keyword.operator",
regex : "\\+|\\-|\\/|\\/\\/|%|<@>|@>|<@|&|\\^|~|<|>|<=|=>|==|!=|<>|=" regex : "\\+|\\-|\\/|\\/\\/|%|<@>|@>|<@|&|\\^|~|<|>|<=|=>|==|!=|<>|="

35
lib/ace/theme/sqlserver.css
View file

@ -18,14 +18,6 @@
color: #008080; color: #008080;
} }
.ace-sqlserver .ace_function{
color: #FF00FF;
text-transform: uppercase;
}
.ace-sqlserver .ace_string{
color: #FF0000;
}
.ace-sqlserver .ace_keyword{ .ace-sqlserver .ace_keyword{
color: #0000FF; color: #0000FF;
@ -40,7 +32,7 @@
color: black; color: black;
} }
.ace-sqlserver .ace_language{ .ace-sqlserver .ace_storage{
color: #979797; color: #979797;
font-style: italic; font-style: italic;
text-transform: uppercase; text-transform: uppercase;
@ -92,10 +84,15 @@
color: rgb(6, 150, 14); color: rgb(6, 150, 14);
} }
.ace-sqlserver .ace_support.ace_type, /*.ace-sqlserver .ace_support.ace_type,
.ace-sqlserver .ace_support.ace_class .ace-sqlserver .ace_support*/
.ace-sqlserver .ace_class{
/*font-style:italic;*/
color: #008080;
}
.ace-sqlserver .ace_support.ace_other { .ace-sqlserver .ace_support.ace_other {
color: rgb(109, 121, 222); color: #6D79DE;
} }
.ace-sqlserver .ace_variable.ace_parameter { .ace-sqlserver .ace_variable.ace_parameter {
@ -107,15 +104,15 @@
} }
.ace-sqlserver .ace_comment { .ace-sqlserver .ace_comment {
color: #236e24; color: #FD971F;
} }
.ace-sqlserver .ace_comment.ace_doc { .ace-sqlserver .ace_comment.ace_doc {
color: #236e24; color: #FD971F;
} }
.ace-sqlserver .ace_comment.ace_doc.ace_tag { .ace-sqlserver .ace_comment.ace_doc.ace_tag {
color: #236e24; color: #FD971F;
} }
.ace-sqlserver .ace_constant.ace_numeric { .ace-sqlserver .ace_constant.ace_numeric {
@ -173,18 +170,16 @@
border: 1px solid rgb(200, 200, 250); border: 1px solid rgb(200, 200, 250);
} }
.ace-sqlserver .ace_storage,
.ace-sqlserver .ace_keyword,
.ace-sqlserver .ace_meta.ace_tag { .ace-sqlserver .ace_meta.ace_tag {
color: rgb(147, 15, 128); color: #0000FF;
} }
.ace-sqlserver .ace_string.ace_regex { .ace-sqlserver .ace_string.ace_regex {
color: rgb(255, 0, 0) color: #FF0000;
} }
.ace-sqlserver .ace_string { .ace-sqlserver .ace_string {
color: #1A1AA6; color: #FF0000;
} }
.ace-sqlserver .ace_entity.ace_other.ace_attribute-name { .ace-sqlserver .ace_entity.ace_other.ace_attribute-name {