Repository: incubator-nifi Updated Branches: refs/heads/develop bef65db72 -> c026dff40
NIFI-511: - Requiring an open parenthesis to consider the token a function. Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/c026dff4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/c026dff4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/c026dff4 Branch: refs/heads/develop Commit: c026dff40c469f37e29a07fbfaa64a2a4575f92c Parents: bef65db Author: Matt Gilman <[email protected]> Authored: Tue Apr 21 08:01:11 2015 -0400 Committer: Matt Gilman <[email protected]> Committed: Tue Apr 21 08:01:11 2015 -0400 ---------------------------------------------------------------------- .../src/main/webapp/js/jquery/nfeditor/languages/nfel.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c026dff4/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/nfeditor/languages/nfel.js ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/nfeditor/languages/nfel.js b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/nfeditor/languages/nfel.js index 7644c77..a73003f 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/nfeditor/languages/nfel.js +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/nfeditor/languages/nfel.js @@ -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 // --------
