From 33cf2101801b7b7690b80b6eb3a4133284c3457a Mon Sep 17 00:00:00 2001 From: Abram Adams Date: Mon, 27 Jan 2014 10:21:45 -0800 Subject: [PATCH 1/2] Fixed regex to match beginning of tag name --- lib/ace/mode/behaviour/coldfusion.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/ace/mode/behaviour/coldfusion.js b/lib/ace/mode/behaviour/coldfusion.js index 6f0ff758..623a5d45 100644 --- a/lib/ace/mode/behaviour/coldfusion.js +++ b/lib/ace/mode/behaviour/coldfusion.js @@ -59,8 +59,8 @@ var CfmlBehaviour = function () { var position = editor.getCursorPosition(); var iterator = new TokenIterator(session, position.row, position.column); var token = iterator.getCurrentToken(); - - if (token && hasType(token, 'meta.tag.name') && token.value.match(/cfabort|cfapplication|cfargument|cfassociate|cfbreak|cfcache|cfcollection|cfcookie|cfdbinfo|cfdirectory|cfdump|cfelse|cfelseif|cferror|cfexchangecalendar|cfexchangeconnection|cfexchangecontact|cfexchangefilter|cfexchangetask|cfexit|cffeed|cffile|cfflush|cfftp|cfheader|cfhtmlhead|cfhttpparam|cfimage|cfimport|cfinclude|cfindex|cfinsert|cfinvokeargument|cflocation|cflog|cfmailparam|cfNTauthenticate|cfobject|cfobjectcache|cfparam|cfpdfformparam|cfprint|cfprocparam|cfprocresult|cfproperty|cfqueryparam|cfregistry|cfreportparam|cfrethrow|cfreturn|cfschedule|cfsearch|cfset|cfsetting|cfthrow|cfzipparam/gi) !== null) + + if (token && hasType(token, 'meta.tag.name') && token.value.match(/^cf+[abort|application|argument|associate|break|cache|collection|cookie|dbinfo|directory|dump|else|elseif|error|exchangecalendar|exchangeconnection|exchangecontact|exchangefilter|exchangetask|exit|feed|file|flush|ftp|header|htmlhead|httpparam|image|import|include|index|insert|invokeargument|location|log|mailparam|NTauthenticate|object|objectcache|param|pdfformparam|print|procparam|procresult|property|queryparam|registry|reportparam|rethrow|return|schedule|search|set|setting|throw|zipparam]/gi) !== null) return; if (hasType(token, 'string') && iterator.getCurrentTokenColumn() + token.value.length > position.column) return; From b54d268a729e3052f8fc7d624294ac4ff57a70c2 Mon Sep 17 00:00:00 2001 From: nightwing Date: Sat, 1 Feb 2014 04:06:31 +0400 Subject: [PATCH 2/2] fix typo --- lib/ace/mode/behaviour/coldfusion.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ace/mode/behaviour/coldfusion.js b/lib/ace/mode/behaviour/coldfusion.js index 623a5d45..d692e20e 100644 --- a/lib/ace/mode/behaviour/coldfusion.js +++ b/lib/ace/mode/behaviour/coldfusion.js @@ -60,7 +60,7 @@ var CfmlBehaviour = function () { var iterator = new TokenIterator(session, position.row, position.column); var token = iterator.getCurrentToken(); - if (token && hasType(token, 'meta.tag.name') && token.value.match(/^cf+[abort|application|argument|associate|break|cache|collection|cookie|dbinfo|directory|dump|else|elseif|error|exchangecalendar|exchangeconnection|exchangecontact|exchangefilter|exchangetask|exit|feed|file|flush|ftp|header|htmlhead|httpparam|image|import|include|index|insert|invokeargument|location|log|mailparam|NTauthenticate|object|objectcache|param|pdfformparam|print|procparam|procresult|property|queryparam|registry|reportparam|rethrow|return|schedule|search|set|setting|throw|zipparam]/gi) !== null) + if (token && hasType(token, 'meta.tag.name') && /^cf+(abort|application|argument|associate|break|cache|collection|cookie|dbinfo|directory|dump|else|elseif|error|exchangecalendar|exchangeconnection|exchangecontact|exchangefilter|exchangetask|exit|feed|file|flush|ftp|header|htmlhead|httpparam|image|import|include|index|insert|invokeargument|location|log|mailparam|NTauthenticate|object|objectcache|param|pdfformparam|print|procparam|procresult|property|queryparam|registry|reportparam|rethrow|return|schedule|search|set|setting|throw|zipparam)$/gi.test(token.value)) return; if (hasType(token, 'string') && iterator.getCurrentTokenColumn() + token.value.length > position.column) return;