From ce78d3062666fb668f5a1820009d49f671b07ca8 Mon Sep 17 00:00:00 2001
From: Robert Jackson <robert.w.jackson@me.com>
Date: Wed, 12 Aug 2015 16:11:14 -0400
Subject: [PATCH] [BUGFIX release] Prevent helper:@content-helper lookups.

This special value is used in HTMLBars in some circumstances, and causes
an error in the ember-cli resolver (until latest version).

The default path here is only present to support legacy `makeViewHelper`
style helpers, and is removed on 2.0.0.
---
 packages/ember-htmlbars/lib/hooks/link-render-node.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/ember-htmlbars/lib/hooks/link-render-node.js b/packages/ember-htmlbars/lib/hooks/link-render-node.js
index fb864e9a9a8..94cc598e060 100644
--- a/packages/ember-htmlbars/lib/hooks/link-render-node.js
+++ b/packages/ember-htmlbars/lib/hooks/link-render-node.js
@@ -23,6 +23,7 @@ export default function linkRenderNode(renderNode, env, scope, path, params, has
       case 'unless':
       case 'if': params[0] = shouldDisplay(params[0]); break;
       case 'each': params[0] = eachParam(params[0]); break;
+      case '@content-helper': break;
       default:
         helper = findHelper(path, env.view, env);