Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-511: 

- Requiring an open parenthesis to consider the token a function.
This commit is contained in:
Matt Gilman 2015-04-21 08:01:11 -04:00
parent bef65db72c
commit c026dff40c
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/nfeditor/languages/nfel.js vendored
View File

@ -14,6 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/* global nf, CodeMirror */
nf.nfel = (function() {
/**
@ -410,8 +413,8 @@ nf.nfel = (function() {
// consume the entire token to better support suggest below
stream.match(attributeOrSubjectlessFunctionExpression);
// if the result returned a match
if (subjectlessFunctionRegex.test(attributeOrSubjectlessFunctionName)) {
// if the result returned a match and is followed by a (
if (subjectlessFunctionRegex.test(attributeOrSubjectlessFunctionName) && stream.peek() === '(') {
// --------------------
// subjectless function
// --------------------
@ -550,8 +553,8 @@ nf.nfel = (function() {
// against the latter.
stream.match(/^[a-zA-Z]+/);
// see if this matches a known function
if (functionRegex.test(functionName)) {
// see if this matches a known function and is followed by (
if (functionRegex.test(functionName) && stream.peek() === '(') {
// --------
// function
// --------