refactor: additional tweaks after revert

ranjithbantu · Jan 12, 2019 · 794ad0d · 794ad0d
1 parent 6a2994e
commit 794ad0d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/compiler/parser/index.js b/src/compiler/parser/index.js
@@ -99,7 +99,7 @@ export function parse (
 
  function closeElement (element) {
  if (!inVPre && !element.processed) {
- element = processElement(element, options, currentParent)
+ element = processElement(element, options)
  }
  // tree management
  if (!stack.length && element !== root) {
@@ -377,8 +377,7 @@ function processRawAttrs (el) {
 
 export function processElement (
  element: ASTElement,
- options: CompilerOptions,
- parent: ASTElement | undefined
+ options: CompilerOptions
 ) {
  processKey(element)
 
@@ -391,7 +390,7 @@ export function processElement (
  )
 
  processRef(element)
- processSlot(element, parent)
+ processSlot(element)
  processComponent(element)
  for (let i = 0; i < transforms.length; i++) {
  element = transforms[i](element, options) || element

diff --git a/test/unit/features/component/component-scoped-slot.spec.js b/test/unit/features/component/component-scoped-slot.spec.js
@@ -458,7 +458,7 @@ describe('Component scoped slot', () => {
  // new in 2.6, unifying all slots as functions
  it('non-scoped slots should also be available on $scopedSlots', () => {
  const vm = new Vue({
- template: `<foo>before <div slot="bar">{{ $slot.msg }}</div> after</foo>`,
+ template: `<foo>before <div slot="bar" slot-scope="{ msg }">{{ msg }}</div> after</foo>`,
  components: {
  foo: {
  render(h) {