From 461faa9184a1f408da128508f24b542976f04476 Mon Sep 17 00:00:00 2001
From: sevin7676 <sevin7@gmail.com>
Date: Fri, 17 Apr 2015 08:37:54 -0400
Subject: [PATCH] more progress

---
 demo/kitchen-sink/docs/sqlserver.sqlserver | 42 +++++++++++-----------
 lib/ace/mode/sqlserver_highlight_rules.js  |  3 ++
 lib/ace/theme/sqlserver.css                | 35 ++++++++----------
 3 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/demo/kitchen-sink/docs/sqlserver.sqlserver b/demo/kitchen-sink/docs/sqlserver.sqlserver
index ff9ad353..94360e3f 100644
--- a/demo/kitchen-sink/docs/sqlserver.sqlserver
+++ b/demo/kitchen-sink/docs/sqlserver.sqlserver
@@ -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
-SELECT
-	
---#region Orders
-	Orders.OrderID
-	,Orders.CustomerID
-	,Orders.OrderDate
---#endregion
+BEGIN
+	-- SET NOCOUNT ON added to prevent extra result sets from
+	-- interfering with SELECT statements.
+	SET NOCOUNT ON;
 
-	/*#region Customers*/
-	,Customers.CompanyName
-	,Customers.ContactName
-	/*#endregion*/
-	
---#region Other
-	,DATEFROMPARTS(YEAR(GETDATE()), 1, 1) AS FirstDayOfYear
---#endregion
-
-FROM Orders
-INNER JOIN Customers
-	ON Orders.CustomerID = Customers.CustomerID
+	SELECT Orders.OrderID, Customers.CompanyName, DATEFROMPARTS(YEAR(GETDATE()), 1, 1) AS FirstDayOfYear
+	FROM Orders
+	INNER JOIN Customers
+		ON Orders.CustomerID = Customers.CustomerID
+END
\ No newline at end of file
diff --git a/lib/ace/mode/sqlserver_highlight_rules.js b/lib/ace/mode/sqlserver_highlight_rules.js
index e860cfae..277bdc6c 100644
--- a/lib/ace/mode/sqlserver_highlight_rules.js
+++ b/lib/ace/mode/sqlserver_highlight_rules.js
@@ -131,6 +131,9 @@ var SqlServerHighlightRules = function() {
         }, {
             token : keywordMapper,
             regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
+        }, {
+            token : "constant.class",
+            regex : "@@?[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
         }, {
             token : "keyword.operator",
             regex : "\\+|\\-|\\/|\\/\\/|%|<@>|@>|<@|&|\\^|~|<|>|<=|=>|==|!=|<>|="
diff --git a/lib/ace/theme/sqlserver.css b/lib/ace/theme/sqlserver.css
index a752280d..ad6fe1f6 100644
--- a/lib/ace/theme/sqlserver.css
+++ b/lib/ace/theme/sqlserver.css
@@ -18,14 +18,6 @@
     color: #008080;
 }
 
-.ace-sqlserver .ace_function{
-    color: #FF00FF;
-    text-transform: uppercase;
-}
-
-.ace-sqlserver .ace_string{
-    color: #FF0000;
-}
 
 .ace-sqlserver .ace_keyword{
     color: #0000FF;
@@ -40,7 +32,7 @@
     color: black;
 }
 
-.ace-sqlserver .ace_language{
+.ace-sqlserver .ace_storage{
     color: #979797;
     font-style: italic;
     text-transform: uppercase;
@@ -92,10 +84,15 @@
   color: rgb(6, 150, 14);
 }
 
-.ace-sqlserver .ace_support.ace_type,
-.ace-sqlserver .ace_support.ace_class
+/*.ace-sqlserver .ace_support.ace_type,
+.ace-sqlserver .ace_support*/
+
+.ace-sqlserver .ace_class{
+  /*font-style:italic;*/
+   color: #008080;
+}
 .ace-sqlserver .ace_support.ace_other {
-  color: rgb(109, 121, 222);
+  color: #6D79DE;
 }
 
 .ace-sqlserver .ace_variable.ace_parameter {
@@ -107,15 +104,15 @@
 }
 
 .ace-sqlserver .ace_comment {
-  color: #236e24;
+  color: #FD971F;
 }
 
 .ace-sqlserver .ace_comment.ace_doc {
-  color: #236e24;
+  color: #FD971F;
 }
 
 .ace-sqlserver .ace_comment.ace_doc.ace_tag {
-  color: #236e24;
+  color: #FD971F;
 }
 
 .ace-sqlserver .ace_constant.ace_numeric {
@@ -173,18 +170,16 @@
   border: 1px solid rgb(200, 200, 250);
 }
 
-.ace-sqlserver .ace_storage,
-.ace-sqlserver .ace_keyword,
 .ace-sqlserver .ace_meta.ace_tag {
-  color: rgb(147, 15, 128);
+  color: #0000FF;
 }
 
 .ace-sqlserver .ace_string.ace_regex {
-  color: rgb(255, 0, 0)
+  color: #FF0000;
 }
 
 .ace-sqlserver .ace_string {
-  color: #1A1AA6;
+  color: #FF0000;
 }
 
 .ace-sqlserver .ace_entity.ace_other.ace_attribute-name {