From 09f25f618fbc2d57c252b12891dae86b9cf0333f Mon Sep 17 00:00:00 2001
From: Sean Lip <sll@google.com>
Date: Fri, 23 Sep 2016 18:33:59 -0700
Subject: [PATCH] Add information about the surrounding parent to the block
 description, for context.

---
 accessible/toolbox-tree.component.js   |  6 +++---
 accessible/workspace-tree.component.js | 11 ++++++++++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/accessible/toolbox-tree.component.js b/accessible/toolbox-tree.component.js
index 2d1d461b5..62fa6290f 100644
--- a/accessible/toolbox-tree.component.js
+++ b/accessible/toolbox-tree.component.js
@@ -30,9 +30,9 @@ blocklyApp.ToolboxTreeComponent = ng.core
     template: `
     <li [id]="idMap['toolboxBlockRoot']" role="treeitem"
         [ngClass]="{blocklyHasChildren: displayBlockMenu}"
-        [attr.aria-labelledBy]="generateAriaLabelledByAttr(idMap['blockSummary'], 'blockly-toolbox-block')"
+        [attr.aria-labelledBy]="generateAriaLabelledByAttr(idMap['toolboxBlockSummary'], 'blockly-toolbox-block')"
         [attr.aria-level]="level">
-      <label #blockSummary [id]="idMap['blockSummary']">{{getBlockDescription()}}</label>
+      <label #toolboxBlockSummary [id]="idMap['toolboxBlockSummary']">{{getBlockDescription()}}</label>
       <ol role="group" *ngIf="displayBlockMenu">
         <li [id]="idMap['sendToSelected']" role="treeitem" *ngIf="!isWorkspaceEmpty()"
             [attr.aria-labelledBy]="generateAriaLabelledByAttr(idMap['sendToSelectedButton'], 'blockly-button')"
@@ -73,7 +73,7 @@ blocklyApp.ToolboxTreeComponent = ng.core
       this.utilsService = _utilsService;
     }],
     ngOnInit: function() {
-      var idKeys = ['toolboxBlockRoot', 'blockSummary'];
+      var idKeys = ['toolboxBlockRoot', 'toolboxBlockSummary'];
       if (this.displayBlockMenu) {
         idKeys = idKeys.concat([
             'workspaceCopy', 'workspaceCopyButton', 'sendToSelected',
diff --git a/accessible/workspace-tree.component.js b/accessible/workspace-tree.component.js
index e8125038a..bab171cd8 100644
--- a/accessible/workspace-tree.component.js
+++ b/accessible/workspace-tree.component.js
@@ -115,7 +115,16 @@ blocklyApp.WorkspaceTreeComponent = ng.core
       this.audioService = _audioService;
     }],
     getBlockDescription: function() {
-      return this.utilsService.getBlockDescription(this.block);
+      var blockDescription = this.utilsService.getBlockDescription(this.block);
+
+      var parentBlock = this.block.getSurroundParent();
+      if (parentBlock) {
+        var fullDescription = blockDescription + ' inside ' +
+            this.utilsService.getBlockDescription(parentBlock);
+        return fullDescription;
+      } else {
+        return blockDescription;
+      }
     },
     removeBlockAndSetFocus_: function(block, deleteBlockFunc) {
       this.treeService.removeBlockAndSetFocus(