@@ -19,63 +19,63 @@ I grant any entity the right to use this work for any purpose, without any condi <behavior> <append-dynamic> <matched-suffix>.+ </matched-suffix> - <transform-into>#0 </transform-into> + <transform-into>$0 $1</transform-into> </append-dynamic> - <confirm characters=" " /> + <!-- <confirm characters=" " /> --> </behavior> <set name="net.fileability.sql.verbs"> - <completion string="SELECT " /> - <completion string="SELECT DISTINCT " /> - <completion string="SELECT * FROM " /> + <completion string="SELECT" /> + <completion string="SELECT DISTINCT" /> + <completion string="SELECT * FROM" /> - <completion string="WHERE " /> + <completion string="WHERE" /> - <completion string="INSERT " /> + <completion string="INSERT" /> - <completion string="UPDATE " /> - <completion string="VALUES " /> - <completion string="SET " /> + <completion string="UPDATE" /> + <completion string="VALUES" /> + <completion string="SET" /> <completion string="NOT NULL" /> <completion string="NULL" /> - <completion string="CREATE " /> - <completion string="CREATE TABLE " /> - <completion string="CREATE USER " /> - <completion string="CREATE DATABASE " /> - <completion string="CREATE INDEX " /> - <completion string="CREATE VIEW " /> - <completion string="CREATE TRIGGER " /> + <completion string="CREATE" /> + <completion string="CREATE TABLE" /> + <completion string="CREATE USER" /> + <completion string="CREATE DATABASE" /> + <completion string="CREATE INDEX" /> + <completion string="CREATE VIEW" /> + <completion string="CREATE TRIGGER" /> - <completion string="DROP " /> - <completion string="DROP TABLE " /> - <completion string="DROP INDEX " /> - <completion string="DROP VIEW " /> - <completion string="DROP TRIGGER " /> - <completion string="DROP USER " /> - <completion string="DROP DATABASE " /> + <completion string="DROP" /> + <completion string="DROP TABLE" /> + <completion string="DROP INDEX" /> + <completion string="DROP VIEW" /> + <completion string="DROP TRIGGER" /> + <completion string="DROP USER" /> + <completion string="DROP DATABASE" /> - <completion string="ALTER " /> - <completion string="ALTER TABLE " /> - <completion string="ALTER INDEX " /> - <completion string="ALTER VIEW " /> - <completion string="ALTER TRIGGER " /> - <completion string="ALTER USER " /> - <completion string="ALTER DATABASE " /> + <completion string="ALTER" /> + <completion string="ALTER TABLE" /> + <completion string="ALTER INDEX" /> + <completion string="ALTER VIEW" /> + <completion string="ALTER TRIGGER" /> + <completion string="ALTER USER" /> + <completion string="ALTER DATABASE" /> - <completion string="PRIMARY KEY " /> + <completion string="PRIMARY KEY" /> - <completion string="IF NOT EXISTS " /> + <completion string="IF NOT EXISTS" /> </set> <set name="net.fileability.sql.types"> <completion string="INT" /> <completion string="INTEGER" /> <completion string="BIGINT" /> - <completion string="TEXT " /> + <completion string="TEXT" /> <completion string="VARCHAR" /> <completion string="BOOLEAN" /> </set> @@ -84,7 +84,7 @@ I grant any entity the right to use this work for any purpose, without any condi <completion string="CURRENT_DATE" /> <completion string="CURRENT_TIME" /> <completion string="CURRENT_TIMESTAMP" /> - <completion string="CURRENT_USER " /> + <completion string="CURRENT_USER" /> <completion string="AVG" /> <completion string="COUNT" /> <completion string="MIN" /> CodeSenseLibraries/SQL.xml @@ -6,7 +6,7 @@ CodeSense Providers map contexts in a document to possible completions. The actu --> <codesense> - <provider> + <!--<provider> <selector>sql</selector> <completions>net.fileability.sql.verbs</completions> <complete-match capture="2">(\s*)([a-zA-Z0-9-]+)</complete-match> @@ -23,5 +23,23 @@ CodeSense Providers map contexts in a document to possible completions. The actu <completions>net.fileability.sql.functions</completions> <complete-match capture="2">(\s*)([a-zA-Z0-9\-_]+)</complete-match> </provider> - +--> + <provider> + <selector>sql:not(comment, string.quoted, entity.name)</selector> + <completions>net.fileability.sql.verbs</completions> + <complete-match capture="0">[A-Za-z_][A-Za-z0-9_]*</complete-match> + </provider> + + <provider> + <selector>sql:not(comment, string.quoted, entity.name)</selector> + <completions>net.fileability.sql.types</completions> + <complete-match capture="0">[A-Za-z_][A-Za-z0-9_]*</complete-match> + </provider> + + <provider> + <selector>sql:not(comment, string.quoted, entity.name)</selector> + <completions>net.fileability.sql.functions</completions> + <complete-match capture="0">[A-Za-z_][A-Za-z0-9_]*</complete-match> + </provider> + </codesense> CodeSenseProviders/SQL.xml @@ -32,7 +32,7 @@ I grant any entity the right to use this work for any purpose, without any condi <!-- Types --> <zone name="storage.type.sql"> - <expression>\b(?i:(bigint|bigserial|bit|boolean|date|double\sprecision|int|integer|real|serial|smallint|sysdate|text|timestamp|tinytext|((varying|character|tinyint|var\schar|float|interval|char|number|varchar|numeric)\d*)))\b</expression> + <expression>\b(?i:(bigint|bigserial|bit|boolean|date|double\sprecision|decimal|int|integer|real|serial|smallint|sysdate|text|timestamp|tinytext|((varying|character|tinyint|var\schar|float|interval|char|number|varchar|numeric)\d*)))\b</expression> </zone> <!-- Field Modifiers --> Syntaxes/SQL XML.xml 981408ca1b8a88a0c817575546b0b613e41e2864 Alex Gordon anything@fileability.net http://github.com/fileability/sql.sugar/commit/32cc27411d38ba7a191edcbd23528692e65f038c 32cc27411d38ba7a191edcbd23528692e65f038c 2009-04-19T13:10:32-07:00 2009-04-19T13:10:32-07:00 Fixed some bugs fe3b5fa8f178e0197ca9288cb4aaef272bb9f42e Alex Gordon anything@fileability.net