@lvce-editor/static-server 0.53.3 → 0.53.4

package/static/{d4964b6 → 03e29f4}/packages/debug-worker/dist/debugWorkerMain.js

@@ -997,6 +997,7 @@ const WebWorkerRpcClient = {
 const None$6 = 0;
 const Paused = 1;
 const Default = 2;
+const Unavailable = 3;
 
 const rpcs = Object.create(null);
 const set$d = (id, rpc) => {
@@ -1522,7 +1523,9 @@ const create = (id, uri, x, y, width, height) => {
     editingselectionstart: 0,
     editingselectionend: 0,
     openFilesOnPause: true,
-    maxDescriptionLength: 100
+    maxDescriptionLength: 100,
+    selectedIndex: -1,
+    visibleRows: []
   };
   set(id, state, state);
 };
@@ -1563,7 +1566,7 @@ const RenderSelection = 8;
 
 const diffType = RenderItems;
 const isEqual$2 = (oldState, newState) => {
-  return oldState.scopeChain === newState.scopeChain && oldState.scopeExpanded === newState.scopeExpanded && oldState.callFrameId === newState.callFrameId && oldState.breakPointsExpanded === newState.breakPointsExpanded && oldState.debugState === newState.debugState && oldState.watchExpanded === newState.watchExpanded && oldState.callStackExpanded === newState.callStackExpanded && oldState.watchExpressions === newState.watchExpressions;
+  return oldState.scopeChain === newState.scopeChain && oldState.scopeExpanded === newState.scopeExpanded && oldState.callFrameId === newState.callFrameId && oldState.breakPointsExpanded === newState.breakPointsExpanded && oldState.debugState === newState.debugState && oldState.watchExpanded === newState.watchExpanded && oldState.callStackExpanded === newState.callStackExpanded && oldState.watchExpressions === newState.watchExpressions && oldState.visibleRows === newState.visibleRows;
 };
 
 const isEqual$1 = (oldState, newState) => {
@@ -1606,7 +1609,7 @@ const dispose = async uid => {
   dispose$1(uid);
 };
 
-const commandIds = ['acceptWatchExpressionEdit', 'addWatchExpression', 'cancelWatchExpressionEdit', 'create', 'diff2', 'dispose', 'focusNext', 'focusPrevious', 'getCommandIds', 'getKeyBindings', 'handleArrowDown', 'handleArrowLeft', 'handleArrowUp', 'handleChange', 'handleClickCallStackItem', 'handleClickCheckBox', 'handleClickDebugButton', 'handleClickPauseOnExceptions', 'handleClickPauseOnUncaughtExceptions', 'handleClickScopeValue', 'handleClickSectionAction', 'handleClickSectionBreakPoints', 'handleClickSectionCallstack', 'handleClickSectionHeading', 'handleClickSectionScope', 'handleClickSectionWatch', 'handleClickWatchExpression', 'handleWatchExpressionDoubleClick', 'handleClickWatchExpressionDelete', 'handleDebugInput', 'handleEvaluate', 'handleInputBlur', 'handleInputFieldChange', 'handlePaused', 'handleResumed', 'handleScriptParsed', 'handleSectionHeaderContextMenu', 'handleWatchExpressionContextMenu', 'handleWatchValueChange', 'loadContent', 'loadContentLater', 'pause', 'refresh', 'removeWatchExpression', 'deleteWatchExpression', 'deleteAllWatchExpressions', 'render2', 'renderActions', 'renderEventListeners', 'resize', 'restoreState', 'resume', 'setPauseOnExceptions', 'stepInto', 'stepOut', 'stepOver', 'terminate', 'togglePause', 'showWatch', 'hideWatch', 'showScope', 'hideScope', 'showCallStack', 'hideCallStack'];
+const commandIds = ['acceptWatchExpressionEdit', 'addWatchExpression', 'cancelWatchExpressionEdit', 'create', 'diff2', 'dispose', 'focusNext', 'focusPrevious', 'getCommandIds', 'getKeyBindings', 'handleArrowDown', 'handleArrowLeft', 'handleArrowUp', 'handleChange', 'handleClickCallStackItem', 'handleClickCheckBox', 'handleClickDebugButton', 'handleClickPauseOnExceptions', 'handleClickPauseOnUncaughtExceptions', 'handleClickScopeValue', 'handleClickSectionAction', 'handleClickSectionBreakPoints', 'handleClickSectionCallstack', 'handleClickSectionHeading', 'handleClickSectionScope', 'handleClickSectionWatch', 'handleClickWatchExpression', 'handleWatchExpressionDoubleClick', 'handleClickWatchExpressionDelete', 'handleDebugInput', 'handleEvaluate', 'handleInputBlur', 'handleInputFieldChange', 'handlePaused', 'handleResumed', 'handleScriptParsed', 'handleSectionHeaderContextMenu', 'handleWatchExpressionContextMenu', 'handleWatchValueChange', 'loadContent', 'loadContentLater', 'pause', 'refresh', 'refreshWatchExpression', 'removeWatchExpression', 'deleteWatchExpression', 'deleteAllWatchExpressions', 'render2', 'renderActions', 'renderEventListeners', 'resize', 'restoreState', 'resume', 'selectIndex', 'selectNextRow', 'selectPreviousRow', 'setPauseOnExceptions', 'stepInto', 'stepOut', 'stepOver', 'terminate', 'togglePause', 'showWatch', 'hideWatch', 'showScope', 'hideScope', 'showCallStack', 'hideCallStack'];
 
 const getCommandIds = () => {
   return commandIds;
@@ -1763,7 +1766,7 @@ const i18nString = (key, placeholders = emptyObject) => {
 };
 
 const Block$1 = 'Block';
-const BreakPoints$1 = 'BreakPoints';
+const BreakPoints$2 = 'BreakPoints';
 const CallStack$3 = 'Call Stack';
 const Catch$1 = '`Catch` block';
 const Closure$1 = 'Closure';
@@ -1775,6 +1778,7 @@ const Global$1 = 'Global';
 const Local$1 = 'Local';
 const Module$1 = 'Module';
 const NamedClosure = 'Closure ({PH1})';
+const NoScriptRunning = 'No script running. To enable debugging, start a Node.js script with debugging enabled (e.g. node --inspect your-script.js) and connect to it.';
 const NotPaused = 'Not Paused';
 const Pause = 'Pause';
 const Restart = 'Restart';
@@ -1851,7 +1855,7 @@ const watch = () => {
   return i18nString(Watch$2);
 };
 const breakPoints = () => {
-  return i18nString(BreakPoints$1);
+  return i18nString(BreakPoints$2);
 };
 const scope = () => {
   return i18nString(Scope$4);
@@ -1889,6 +1893,9 @@ const deleteAllWatchExpressions = () => {
 const addWatchExpression = () => {
   return i18nString(AddWatchExpression$1);
 };
+const noScriptRunning = () => {
+  return i18nString(NoScriptRunning);
+};
 
 const None$2 = 0;
 
@@ -2213,177 +2220,27 @@ const getPausedInfo2 = async (debugId, maxDescriptionLength) => {
   };
 };
 
-const handlePaused2 = async state => {
-  const {
-    debugId,
-    watchExpressions
-  } = state;
-  try {
-    const {
-      callFrameId,
-      callStack,
-      scopeChain,
-      pausedMessage,
-      pausedReason,
-      expandedIds,
-      scriptMap
-    } = await getPausedInfo2(debugId, state.maxDescriptionLength);
-    // TODO move this to getPausedInfo2
-    const newWatchExpressions = await evaluateWatchExpressions(debugId, callFrameId, watchExpressions);
-    return {
-      ...state,
-      debugState: Paused,
-      scopeChain,
-      scopeExpanded: true,
-      callStack,
-      pausedReason,
-      pausedMessage,
-      callFrameId,
-      expandedIds,
-      parsedScripts: scriptMap,
-      watchExpressions: newWatchExpressions
-    };
-  } catch {
-    return state;
-  }
-};
-
-const handleResumed = state => {
-  return {
-    ...state,
-    debugState: Default,
-    scopeChain: [],
-    callStack: [],
-    pausedMessage: '',
-    pausedReason: None$5,
-    callFrameId: ''
-  };
-};
-
-const handleChange = async (state, params) => {
-  if (params.type === 'resumed') {
-    return handleResumed(state);
-  }
-  if (params.type === 'paused') {
-    return handlePaused2(state);
-  }
-  return state;
-};
-
-const isSupportedOpenUri = uri => {
-  if (uri.startsWith('file://')) {
-    return true;
-  }
-  return false;
-};
-
-const getOpenInfo = (id, parsedScripts, item) => {
-  const {
-    location
-  } = item;
-  const {
-    scriptId,
-    lineNumber,
-    columnNumber
-  } = location;
-  const script = parsedScripts[scriptId];
-  const {
-    url,
-    scriptLanguage
-  } = script;
-  if (isSupportedOpenUri(url)) {
-    return {
-      uri: url,
-      languageId: scriptLanguage,
-      rowIndex: lineNumber,
-      columnIndex: columnNumber
-    };
-  }
-  const debugUri = getDebugUri(id, scriptId);
-  return {
-    uri: debugUri,
-    languageId: scriptLanguage,
-    rowIndex: lineNumber,
-    columnIndex: columnNumber
-  };
-};
-
-const parseIndex = dataIndex => {
-  const index = Number.parseInt(dataIndex);
-  return index;
-};
-
-const handleClickCallstackItem = async (state, dataIndex) => {
-  const index = parseIndex(dataIndex);
-  const {
-    callStack,
-    parsedScripts,
-    id
-  } = state;
-  const item = callStack[index];
-  if (!item) {
-    return state;
-  }
-  const {
-    uri,
-    languageId,
-    rowIndex,
-    columnIndex
-  } = getOpenInfo(id, parsedScripts, item);
-  await openUri(uri, languageId, rowIndex, columnIndex);
-  return state;
-};
-
-const setPauseOnExceptions = async (state, value) => {
-  const {
-    debugId,
-    exceptionBreakPoints
-  } = state;
-  if (exceptionBreakPoints === value) {
-    return state;
-  }
-  await setPauseOnExceptions$1(debugId, value);
-  return {
-    ...state,
-    exceptionBreakPoints: value
-  };
-};
+const SectionHeading = 1;
+const Value = 2;
+const Exception = 3;
+const Scope$2 = 4;
+const Property = 5;
+const Message = 6;
+const CallStack$2 = 7;
+const CheckBox$1 = 8;
+const WatchMessage = 9;
+const WatchExpression = 10;
+const InputField = 11;
 
-const handleClickPauseOnExceptions = async state => {
-  const {
-    exceptionBreakPoints
-  } = state;
-  switch (exceptionBreakPoints) {
-    case None$4:
-      return setPauseOnExceptions(state, All);
-    case Uncaught:
-      return setPauseOnExceptions(state, All);
-    case All:
-      return setPauseOnExceptions(state, None$4);
-    default:
-      return state;
-  }
-};
+const Scope$1 = 'Scope';
+const CallStack$1 = 'CallStack';
+const Watch$1 = 'Watch';
+const BreakPoints$1 = 'BreakPoints';
 
-const getNewExceptionState = exceptionState => {
-  switch (exceptionState) {
-    case None$4:
-      return Uncaught;
-    case Uncaught:
-      return None$4;
-    case All:
-      return None$4;
-    default:
-      return exceptionState;
-  }
-};
-const handleClickPauseOnUncaughtExceptions = async state => {
-  const {
-    exceptionBreakPoints
-  } = state;
-  const newExceptionState = getNewExceptionState(exceptionBreakPoints);
-  return setPauseOnExceptions(state, newExceptionState);
-};
+const BreakPoints = 'breakpoints';
+const CallStack = 'callstack';
+const Scope = 'scope';
+const Watch = 'watch';
 
 const AddWatchExpression = 'AddWatchExpression';
 const WatchExpressionInput = 'WatchExpressionInput';
@@ -2396,174 +2253,813 @@ const DebugStepOver$1 = 'DebugStepOver';
 const DebugStop$1 = 'DebugStop';
 const PauseOnExceptions = 'PauseOnExceptions';
 const PauseOnUncaughtExceptions = 'PauseOnUncaughtExceptions';
+const RefreshWatchExpressions = 'RefreshWatchExpressions';
 
-const getCheckBoxClickHandler = name => {
-  switch (name) {
-    case PauseOnExceptions:
-      return handleClickPauseOnExceptions;
-    case PauseOnUncaughtExceptions:
-      return handleClickPauseOnUncaughtExceptions;
-    default:
-      throw new Error('unknown input name');
+const getRunAndDebugVisibleRowsBreakPoints = state => {
+  const {
+    breakPointsExpanded,
+    exceptionBreakPoints,
+    breakPointsVisible
+  } = state;
+  if (!breakPointsVisible) {
+    return [];
   }
+  if (breakPointsExpanded) {
+    return [{
+      type: SectionHeading,
+      text: breakPoints(),
+      expanded: true,
+      key: BreakPoints,
+      value: '',
+      indent: 0,
+      valueType: '',
+      name: BreakPoints$1,
+      description: ''
+    }, {
+      type: CheckBox$1,
+      text: pauseOnExceptions(),
+      expanded: exceptionBreakPoints === All,
+      key: '',
+      value: '',
+      indent: 0,
+      valueType: '',
+      name: PauseOnExceptions,
+      description: ''
+    }, {
+      type: CheckBox$1,
+      text: pauseOnUncaughtExceptions(),
+      expanded: exceptionBreakPoints === Uncaught,
+      key: '',
+      value: '',
+      indent: 0,
+      valueType: '',
+      name: PauseOnUncaughtExceptions,
+      description: ''
+    }];
+  }
+  return [{
+    type: SectionHeading,
+    text: breakPoints(),
+    expanded: breakPointsExpanded,
+    key: BreakPoints,
+    value: '',
+    indent: 0,
+    valueType: '',
+    name: BreakPoints$1,
+    description: ''
+  }];
 };
 
-const handleClickCheckBox = (state, name) => {
-  const fn = getCheckBoxClickHandler(name);
-  return fn(state);
-};
-
-const removeElement = (array, element) => {
-  const index = array.indexOf(element);
-  if (index === -1) {
-    return array;
+const formatLocation = (url, rowIndex, columnIndex) => {
+  const lastSlashIndex = url.lastIndexOf('/');
+  const adjustedRowIndex = rowIndex + 1;
+  if (lastSlashIndex === -1) {
+    return `${url}:${adjustedRowIndex}`;
   }
-  return [...array.slice(0, index), ...array.slice(index + 1)];
+  const part = url.slice(lastSlashIndex + 1);
+  return `${part}:${adjustedRowIndex}`;
 };
 
-const getCollapsedScopeChain = (cache, scopeChain, element, index) => {
-  const indent = element.indent;
-  for (let i = index + 1; i < scopeChain.length; i++) {
-    if (scopeChain[i].indent <= indent) {
-      const newItems = scopeChain.slice(index + 1, i);
-      const newCache = {
-        ...cache,
-        [scopeChain[index].objectId]: newItems
-      };
-      return {
-        newScopeChain: [...scopeChain.slice(0, index + 1), ...scopeChain.slice(i)],
-        newCache
-      };
-    }
-  }
-  return {
-    newScopeChain: scopeChain,
-    newCache: cache
-  };
+const unknownScript = {
+  url: 'unknown'
 };
-
-// TODO maybe store scope chain elements as tree
-// TODO when collapsing, store collapsed elements by parent id in cache
-// TODO when expanding, retrieve items from cache by parent id first
-// if they don't exist, query the actual items
-
-const collapseScopeChain = (state, expandedIds, scopeChain, element, index) => {
+const getRunAndDebugVisibleRowsCallStack = state => {
   const {
-    cache
+    callStack: callStack$1,
+    callStackExpanded,
+    parsedScripts,
+    callStackVisible
   } = state;
-  const newExpandedIds = removeElement(expandedIds, element.objectId);
-  const {
-    newScopeChain,
-    newCache
-  } = getCollapsedScopeChain(cache, scopeChain, element, index);
-  return {
-    ...state,
-    expandedIds: newExpandedIds,
-    scopeChain: newScopeChain,
-    scopeFocusedIndex: index,
-    cache: newCache
-  };
-};
-
-const getInnerChildScopeChain = async (cache, debugId, objectId, indent, maxDescriptionLength) => {
-  if (cache[objectId]) {
-    return cache[objectId];
+  if (!callStackVisible) {
+    return [];
   }
-  const childScopes = await getProperties(debugId, objectId);
-  const childScopeChain = [];
-  for (const child of childScopes.result.result) {
-    const valueLabel = getDebugPropertyValueLabel(child.value || child.get || {}, maxDescriptionLength);
-    childScopeChain.push({
-      type: Property$1,
-      key: child.name,
-      value: valueLabel,
-      valueType: getDebugValueType(child),
-      objectId: getDebugValueObjectId(child),
-      indent: indent + 10
+  const rows = [];
+  if (callStackExpanded) {
+    rows.push({
+      type: SectionHeading,
+      text: callStack(),
+      expanded: true,
+      key: CallStack,
+      value: '',
+      indent: 0,
+      valueType: '',
+      name: CallStack$1,
+      description: ''
+    });
+    if (callStack$1.length === 0) {
+      rows.push({
+        type: Message,
+        text: notPaused(),
+        expanded: false,
+        key: '',
+        value: '',
+        indent: 0,
+        valueType: '',
+        name: '',
+        description: ''
+      });
+    } else {
+      for (const item of callStack$1) {
+        const {
+          scriptId,
+          lineNumber} = item.location;
+        const script = parsedScripts[scriptId] || unknownScript;
+        const description = formatLocation(script.url, lineNumber);
+        const hasArrow = item === callStack$1[0];
+        rows.push({
+          type: CallStack$2,
+          text: item.functionName,
+          expanded: false,
+          key: CallStack,
+          value: '',
+          indent: 0,
+          valueType: '',
+          name: '',
+          description,
+          hasArrow,
+          index: callStack$1.indexOf(item) // TODO use for loop
+        });
+      }
+    }
+  } else {
+    rows.push({
+      type: SectionHeading,
+      text: callStack(),
+      expanded: false,
+      key: '',
+      value: '',
+      indent: 0,
+      valueType: '',
+      name: CallStack$1,
+      description: ''
     });
   }
-  return childScopeChain;
+  return rows;
 };
 
-const getChildScopeChain = async (cache, index, debugId, scopeChain, maxDescriptionLength) => {
-  const element = scopeChain[index];
-  const objectId = element.objectId;
-  const childScopeChain = await getInnerChildScopeChain(cache, debugId, objectId, element.indent, maxDescriptionLength);
-  const newScopeChain = [...scopeChain.slice(0, index + 1), ...childScopeChain, ...scopeChain.slice(index + 1)];
-  return newScopeChain;
+const getNoopRows = () => {
+  return [];
 };
 
-const expandScopeChain = async (state, expandedIds, scopeChain, element, index, debugId) => {
+const getScopeExceptionRows = scope => {
   const {
-    cache,
-    maxDescriptionLength
-  } = state;
-  const newScopeChain = await getChildScopeChain(cache, index, debugId, scopeChain, maxDescriptionLength);
-  const objectId = scopeChain[index].objectId;
-  const newExpandedIds = [...expandedIds, objectId];
-  return {
-    ...state,
-    scopeChain: newScopeChain,
-    expandedIds: newExpandedIds,
-    scopeFocusedIndex: index
-  };
+    key,
+    value,
+    indent
+  } = scope;
+  return [{
+    type: Exception,
+    text: '',
+    expanded: false,
+    key,
+    value,
+    indent,
+    valueType: '',
+    name: '',
+    description: ''
+  }];
 };
 
-const getElementIndex = (debugId, scopeChain, text) => {
-  for (let i = 0; i < scopeChain.length; i++) {
-    const element = scopeChain[i];
-    if (element.key === text) {
-      return i;
-    }
-  }
-  return -1;
-};
+const None = 0;
+const Expanded = 1 << 0;
+const Collapsed = 1 << 1;
+const Focused = 1 << 2;
 
-// TODO pass index to function instead of text
-const handleClickScopeValue = async (state, text) => {
+const getScopePropertyRows = scope => {
   const {
-    scopeChain,
-    debugId,
-    expandedIds
-  } = state;
-  const index = getElementIndex(debugId, scopeChain, text);
-  if (index === -1) {
-    return state;
-  }
-  const element = scopeChain[index];
-  if (expandedIds.includes(element.objectId)) {
-    return collapseScopeChain(state, expandedIds, scopeChain, element, index);
-  }
-  return expandScopeChain(state, expandedIds, scopeChain, element, index, debugId);
-};
-
-/**
- * @deprecated
- */
-const handlePaused = async (state, params) => {
-  return state;
+    indent,
+    key,
+    value,
+    valueType,
+    flags
+  } = scope;
+  return [{
+    type: Property,
+    text: '',
+    expanded: Boolean(flags & Expanded),
+    key,
+    value,
+    indent,
+    valueType,
+    name: '',
+    description: ''
+  }];
 };
 
-// TODO maybe store scope chain elements as tree
-// TODO when collapsing, store collapsed elements by parent id in cache
-// TODO when expanding, retrieve items from cache by parent id first
-// if they don't exist, query the actual items
-
-const resume = async state => {
+const getScopeScopeRows = scope => {
   const {
-    debugId
-  } = state;
-  await resume$2(debugId);
-  return state;
+    key,
+    flags
+  } = scope;
+  return [{
+    type: Scope$2,
+    text: '',
+    expanded: Boolean(flags & Expanded),
+    key,
+    value: '',
+    indent: 0,
+    valueType: '',
+    name: '',
+    description: ''
+  }];
 };
-const pause = async state => {
+
+const getScopeThisRows = scope => {
   const {
-    debugId
-  } = state;
-  await pause$2(debugId);
-  return state;
+    indent,
+    key,
+    value,
+    valueType
+  } = scope;
+  return [{
+    type: Value,
+    text: '',
+    expanded: false,
+    key,
+    value,
+    indent,
+    valueType,
+    name: '',
+    description: ''
+  }];
 };
-const togglePause = async state => {
+
+const getScopeRenderer = type => {
+  switch (type) {
+    case This:
+      return getScopeThisRows;
+    case Exception$1:
+      return getScopeExceptionRows;
+    case Scope$3:
+      return getScopeScopeRows;
+    case Property$1:
+      return getScopePropertyRows;
+    default:
+      return getNoopRows;
+  }
+};
+
+const getExpandable = valueType => {
+  if (valueType === 'object') {
+    return true;
+  }
+  return false;
+};
+const getFlags = (isExpanded, isExpandable, isFocused) => {
+  let flags = None;
+  if (isExpanded) {
+    flags |= Expanded;
+  } else if (isExpandable) {
+    flags |= Collapsed;
+  }
+  if (isFocused) {
+    flags |= Focused;
+  }
+  return flags;
+};
+const getVisibleScopeItems = (scopeChain, expandedIds, focusedIndex) => {
+  const minLineY = 0;
+  const maxLineY = scopeChain.length;
+  const visible = [];
+  for (let i = minLineY; i < maxLineY; i++) {
+    const element = scopeChain[i];
+    const isExpanded = expandedIds.includes(element.objectId);
+    const isExpandable = getExpandable(element.valueType);
+    const isFocused = i === focusedIndex;
+    const flags = getFlags(isExpanded, isExpandable, isFocused);
+    visible.push({
+      ...element,
+      flags
+    });
+  }
+  return visible;
+};
+
+const getRunAndDebugVisibleRowsScope = state => {
+  const {
+    scopeChain,
+    scopeExpanded,
+    expandedIds,
+    scopeFocusedIndex,
+    scopeVisible,
+    debugState
+  } = state;
+  if (!scopeVisible) {
+    return [];
+  }
+  const rows = [];
+  if (scopeExpanded) {
+    rows.push({
+      type: SectionHeading,
+      text: scope(),
+      expanded: true,
+      key: Scope,
+      value: '',
+      indent: 0,
+      valueType: '',
+      name: Scope$1,
+      description: ''
+    });
+    if (debugState === Paused) {
+      const visible = getVisibleScopeItems(scopeChain, expandedIds, scopeFocusedIndex);
+      for (const scope of visible) {
+        const renderer = getScopeRenderer(scope.type);
+        rows.push(...renderer(scope));
+      }
+    } else {
+      rows.push({
+        type: Message,
+        text: notPaused(),
+        expanded: false,
+        key: '',
+        value: '',
+        indent: 0,
+        valueType: '',
+        name: '',
+        description: ''
+      });
+    }
+  } else {
+    rows.push({
+      type: SectionHeading,
+      text: scope(),
+      expanded: false,
+      key: Scope,
+      value: '',
+      indent: 0,
+      valueType: '',
+      name: Scope$1,
+      description: ''
+    });
+  }
+  return rows;
+};
+
+const formatValue = value => {
+  return value === null || value === undefined ? '' : String(value);
+};
+const renderWatchExpression$1 = (expression, value, isEditing, index) => {
+  if (isEditing) {
+    return {
+      type: InputField,
+      text: '',
+      expanded: false,
+      key: 'new-watch-expression',
+      value: '',
+      indent: 0,
+      valueType: '',
+      name: WatchExpressionInput,
+      description: '',
+      index
+    };
+  }
+  return {
+    type: WatchExpression,
+    text: expression,
+    expanded: false,
+    key: expression,
+    value: formatValue(value),
+    indent: 0,
+    valueType: '',
+    name: '',
+    description: '',
+    index
+  };
+};
+const getRunAndDebugVisibleRowsWatchContent = watchExpressions => {
+  const rows = [];
+  if (watchExpressions.length === 0) {
+    rows.push({
+      type: WatchMessage,
+      text: noWatchExpression(),
+      expanded: false,
+      key: '',
+      value: '',
+      indent: 0,
+      valueType: '',
+      name: '',
+      description: ''
+    });
+  } else {
+    for (const watchExpression of watchExpressions) {
+      // TODO simplify index
+      const index = watchExpressions.indexOf(watchExpression);
+      rows.push(renderWatchExpression$1(watchExpression.expression, watchExpression.value, watchExpression.isEditing || false, index));
+    }
+  }
+  return rows;
+};
+
+const getWatchActions = watchExpanded => {
+  if (!watchExpanded) {
+    return [];
+  }
+  return [{
+    id: AddWatchExpression,
+    title: 'Add new watch expression',
+    icon: '+'
+  }, {
+    id: RefreshWatchExpressions,
+    title: 'Refresh watch expressions',
+    icon: '↻'
+  }];
+};
+
+const getRunAndDebugVisibleRowsWatch = state => {
+  const {
+    watchExpanded,
+    watchExpressions,
+    watchVisible
+  } = state;
+  if (!watchVisible) {
+    return [];
+  }
+  const rows = [{
+    type: SectionHeading,
+    text: watch(),
+    expanded: watchExpanded,
+    key: Watch,
+    value: '',
+    indent: 0,
+    valueType: '',
+    name: Watch$1,
+    description: '',
+    actions: getWatchActions(watchExpanded)
+  }];
+  if (watchExpanded) {
+    rows.push(...getRunAndDebugVisibleRowsWatchContent(watchExpressions));
+  }
+  return rows;
+};
+
+const getRunAndDebugVisibleRows = state => {
+  if (state.debugState === Unavailable) {
+    return [{
+      type: Message,
+      text: noScriptRunning(),
+      expanded: false,
+      key: 'no-script-running',
+      value: '',
+      indent: 0,
+      valueType: '',
+      name: '',
+      description: ''
+    }];
+  }
+  return [...getRunAndDebugVisibleRowsWatch(state), ...getRunAndDebugVisibleRowsBreakPoints(state), ...getRunAndDebugVisibleRowsScope(state), ...getRunAndDebugVisibleRowsCallStack(state)];
+};
+
+const updateVisibleRows = state => {
+  const visibleRows = getRunAndDebugVisibleRows(state);
+  return {
+    ...state,
+    visibleRows
+  };
+};
+
+const handlePaused2 = async state => {
+  const {
+    debugId,
+    watchExpressions
+  } = state;
+  try {
+    const {
+      callFrameId,
+      callStack,
+      scopeChain,
+      pausedMessage,
+      pausedReason,
+      expandedIds,
+      scriptMap
+    } = await getPausedInfo2(debugId, state.maxDescriptionLength);
+    // TODO move this to getPausedInfo2
+    const newWatchExpressions = await evaluateWatchExpressions(debugId, callFrameId, watchExpressions);
+    const newState = {
+      ...state,
+      debugState: Paused,
+      scopeChain,
+      scopeExpanded: true,
+      callStack,
+      pausedReason,
+      pausedMessage,
+      callFrameId,
+      expandedIds,
+      parsedScripts: scriptMap,
+      watchExpressions: newWatchExpressions
+    };
+    return updateVisibleRows(newState);
+  } catch {
+    return state;
+  }
+};
+
+const handleResumed = state => {
+  const newState = {
+    ...state,
+    debugState: Default,
+    scopeChain: [],
+    callStack: [],
+    pausedMessage: '',
+    pausedReason: None$5,
+    callFrameId: ''
+  };
+  return updateVisibleRows(newState);
+};
+
+const handleChange = async (state, params) => {
+  let newState = state;
+  if (params.type === 'resumed') {
+    newState = handleResumed(state);
+  } else if (params.type === 'paused') {
+    newState = await handlePaused2(state);
+  }
+  return updateVisibleRows(newState);
+};
+
+const isSupportedOpenUri = uri => {
+  if (uri.startsWith('file://')) {
+    return true;
+  }
+  return false;
+};
+
+const getOpenInfo = (id, parsedScripts, item) => {
+  const {
+    location
+  } = item;
+  const {
+    scriptId,
+    lineNumber,
+    columnNumber
+  } = location;
+  const script = parsedScripts[scriptId];
+  const {
+    url,
+    scriptLanguage
+  } = script;
+  if (isSupportedOpenUri(url)) {
+    return {
+      uri: url,
+      languageId: scriptLanguage,
+      rowIndex: lineNumber,
+      columnIndex: columnNumber
+    };
+  }
+  const debugUri = getDebugUri(id, scriptId);
+  return {
+    uri: debugUri,
+    languageId: scriptLanguage,
+    rowIndex: lineNumber,
+    columnIndex: columnNumber
+  };
+};
+
+const parseIndex = dataIndex => {
+  const index = Number.parseInt(dataIndex);
+  return index;
+};
+
+const handleClickCallstackItem = async (state, dataIndex) => {
+  const index = parseIndex(dataIndex);
+  const {
+    callStack,
+    parsedScripts,
+    id
+  } = state;
+  const item = callStack[index];
+  if (!item) {
+    return state;
+  }
+  const {
+    uri,
+    languageId,
+    rowIndex,
+    columnIndex
+  } = getOpenInfo(id, parsedScripts, item);
+  await openUri(uri, languageId, rowIndex, columnIndex);
+  return state;
+};
+
+const setPauseOnExceptions = async (state, value) => {
+  const {
+    debugId,
+    exceptionBreakPoints
+  } = state;
+  if (exceptionBreakPoints === value) {
+    return state;
+  }
+  await setPauseOnExceptions$1(debugId, value);
+  return {
+    ...state,
+    exceptionBreakPoints: value
+  };
+};
+
+const handleClickPauseOnExceptions = async state => {
+  const {
+    exceptionBreakPoints
+  } = state;
+  switch (exceptionBreakPoints) {
+    case None$4:
+      return setPauseOnExceptions(state, All);
+    case Uncaught:
+      return setPauseOnExceptions(state, All);
+    case All:
+      return setPauseOnExceptions(state, None$4);
+    default:
+      return state;
+  }
+};
+
+const getNewExceptionState = exceptionState => {
+  switch (exceptionState) {
+    case None$4:
+      return Uncaught;
+    case Uncaught:
+      return None$4;
+    case All:
+      return None$4;
+    default:
+      return exceptionState;
+  }
+};
+const handleClickPauseOnUncaughtExceptions = async state => {
+  const {
+    exceptionBreakPoints
+  } = state;
+  const newExceptionState = getNewExceptionState(exceptionBreakPoints);
+  return setPauseOnExceptions(state, newExceptionState);
+};
+
+const getCheckBoxClickHandler = name => {
+  switch (name) {
+    case PauseOnExceptions:
+      return handleClickPauseOnExceptions;
+    case PauseOnUncaughtExceptions:
+      return handleClickPauseOnUncaughtExceptions;
+    default:
+      throw new Error('unknown input name');
+  }
+};
+
+const handleClickCheckBox = (state, name) => {
+  const fn = getCheckBoxClickHandler(name);
+  return fn(state);
+};
+
+const removeElement = (array, element) => {
+  const index = array.indexOf(element);
+  if (index === -1) {
+    return array;
+  }
+  return [...array.slice(0, index), ...array.slice(index + 1)];
+};
+
+const getCollapsedScopeChain = (cache, scopeChain, element, index) => {
+  const indent = element.indent;
+  for (let i = index + 1; i < scopeChain.length; i++) {
+    if (scopeChain[i].indent <= indent) {
+      const newItems = scopeChain.slice(index + 1, i);
+      const newCache = {
+        ...cache,
+        [scopeChain[index].objectId]: newItems
+      };
+      return {
+        newScopeChain: [...scopeChain.slice(0, index + 1), ...scopeChain.slice(i)],
+        newCache
+      };
+    }
+  }
+  return {
+    newScopeChain: scopeChain,
+    newCache: cache
+  };
+};
+
+// TODO maybe store scope chain elements as tree
+// TODO when collapsing, store collapsed elements by parent id in cache
+// TODO when expanding, retrieve items from cache by parent id first
+// if they don't exist, query the actual items
+
+const collapseScopeChain = (state, expandedIds, scopeChain, element, index) => {
+  const {
+    cache
+  } = state;
+  const newExpandedIds = removeElement(expandedIds, element.objectId);
+  const {
+    newScopeChain,
+    newCache
+  } = getCollapsedScopeChain(cache, scopeChain, element, index);
+  const newState = {
+    ...state,
+    expandedIds: newExpandedIds,
+    scopeChain: newScopeChain,
+    scopeFocusedIndex: index,
+    cache: newCache
+  };
+  return updateVisibleRows(newState);
+};
+
+const getInnerChildScopeChain = async (cache, debugId, objectId, indent, maxDescriptionLength) => {
+  if (cache[objectId]) {
+    return cache[objectId];
+  }
+  const childScopes = await getProperties(debugId, objectId);
+  const childScopeChain = [];
+  for (const child of childScopes.result.result) {
+    const valueLabel = getDebugPropertyValueLabel(child.value || child.get || {}, maxDescriptionLength);
+    childScopeChain.push({
+      type: Property$1,
+      key: child.name,
+      value: valueLabel,
+      valueType: getDebugValueType(child),
+      objectId: getDebugValueObjectId(child),
+      indent: indent + 10
+    });
+  }
+  return childScopeChain;
+};
+
+const getChildScopeChain = async (cache, index, debugId, scopeChain, maxDescriptionLength) => {
+  const element = scopeChain[index];
+  const objectId = element.objectId;
+  const childScopeChain = await getInnerChildScopeChain(cache, debugId, objectId, element.indent, maxDescriptionLength);
+  const newScopeChain = [...scopeChain.slice(0, index + 1), ...childScopeChain, ...scopeChain.slice(index + 1)];
+  return newScopeChain;
+};
+
+const expandScopeChain = async (state, expandedIds, scopeChain, element, index, debugId) => {
+  const {
+    cache,
+    maxDescriptionLength
+  } = state;
+  const newScopeChain = await getChildScopeChain(cache, index, debugId, scopeChain, maxDescriptionLength);
+  const objectId = scopeChain[index].objectId;
+  const newExpandedIds = [...expandedIds, objectId];
+  const newState = {
+    ...state,
+    scopeChain: newScopeChain,
+    expandedIds: newExpandedIds,
+    scopeFocusedIndex: index
+  };
+  return updateVisibleRows(newState);
+};
+
+const getElementIndex = (debugId, scopeChain, text) => {
+  for (let i = 0; i < scopeChain.length; i++) {
+    const element = scopeChain[i];
+    if (element.key === text) {
+      return i;
+    }
+  }
+  return -1;
+};
+
+// TODO pass index to function instead of text
+const handleClickScopeValue = async (state, text) => {
+  const {
+    scopeChain,
+    debugId,
+    expandedIds
+  } = state;
+  const index = getElementIndex(debugId, scopeChain, text);
+  if (index === -1) {
+    return state;
+  }
+  const element = scopeChain[index];
+  if (expandedIds.includes(element.objectId)) {
+    return collapseScopeChain(state, expandedIds, scopeChain, element, index);
+  }
+  return expandScopeChain(state, expandedIds, scopeChain, element, index, debugId);
+};
+
+/**
+ * @deprecated
+ */
+const handlePaused = async (state, params) => {
+  return state;
+};
+
+// TODO maybe store scope chain elements as tree
+// TODO when collapsing, store collapsed elements by parent id in cache
+// TODO when expanding, retrieve items from cache by parent id first
+// if they don't exist, query the actual items
+
+const resume = async state => {
+  const {
+    debugId
+  } = state;
+  await resume$2(debugId);
+  return state;
+};
+const pause = async state => {
+  const {
+    debugId
+  } = state;
+  await pause$2(debugId);
+  return state;
+};
+const togglePause = async state => {
   const {
     debugState
   } = state;
@@ -2688,6 +3184,23 @@ const handleClickDebugButton = async (state, inputName) => {
   return fn(state);
 };
 
+const refreshWatchExpression = async state => {
+  const {
+    debugId,
+    callFrameId,
+    debugState,
+    watchExpressions
+  } = state;
+  if (debugState !== Paused) {
+    return state;
+  }
+  const newWatchExpressions = await evaluateWatchExpressions(debugId, callFrameId, watchExpressions);
+  return {
+    ...state,
+    watchExpressions: newWatchExpressions
+  };
+};
+
 const handleClickSectionAction = async (state, actionId) => {
   if (!actionId) {
     return state;
@@ -2695,77 +3208,79 @@ const handleClickSectionAction = async (state, actionId) => {
   if (actionId === AddWatchExpression) {
     return addWatchExpression$1(state, '');
   }
+  if (actionId === RefreshWatchExpressions) {
+    return refreshWatchExpression(state);
+  }
   return state;
 };
 
+const getSectionIndex = (state, name) => {
+  const rows = getRunAndDebugVisibleRows(state);
+  return rows.findIndex(row => row.type === SectionHeading && row.name === name);
+};
+
 const handleClickSectionBreakPoints = state => {
   const {
     breakPointsExpanded
   } = state;
-  return {
+  const newState = {
     ...state,
     breakPointsExpanded: !breakPointsExpanded,
-    focusedIndex: 1 // TODO don't hardcode number
+    selectedIndex: getSectionIndex(state, BreakPoints$1)
   };
+  return updateVisibleRows(newState);
 };
 
 const handleClickSectionCallstack = state => {
   const {
     callStackExpanded
   } = state;
-  return {
+  const newState = {
     ...state,
     callStackExpanded: !callStackExpanded,
-    focusedIndex: 1 // TODO don't hardcode number
+    selectedIndex: getSectionIndex(state, CallStack$1)
   };
+  return updateVisibleRows(newState);
 };
 
-const BreakPoints = 'breakpoints';
-const CallStack$2 = 'callstack';
-const Scope$2 = 'scope';
-const Watch$1 = 'watch';
-
 const handleClickSectionScope = state => {
   const {
     scopeExpanded
   } = state;
-  return {
+  const newState = {
     ...state,
     scopeExpanded: !scopeExpanded,
-    focusedIndex: 2 // TODO don't hardcode number
+    selectedIndex: getSectionIndex(state, Scope$1)
   };
+  return updateVisibleRows(newState);
 };
 
 const handleClickSectionUnkown = state => {
-  const {
-    callStackExpanded
-  } = state;
-  return {
-    ...state,
-    callStackExpanded: !callStackExpanded
-  };
+  // For unknown section IDs, return the state unchanged
+  return state;
 };
 
 const handleClickSectionWatch = state => {
   const {
     watchExpanded
   } = state;
-  return {
+  const newState = {
     ...state,
     watchExpanded: !watchExpanded,
-    focusedIndex: 0 // TODO don't hardcode number
+    selectedIndex: getSectionIndex(state, Watch$1)
   };
+  return updateVisibleRows(newState);
 };
 
 const getSectionClickHandler = id => {
   switch (id) {
-    case Watch$1:
+    case Watch:
       return handleClickSectionWatch;
     case BreakPoints:
       return handleClickSectionBreakPoints;
-    case Scope$2:
+    case Scope:
       return handleClickSectionScope;
-    case CallStack$2:
+    case CallStack:
       return handleClickSectionCallstack;
     default:
       return handleClickSectionUnkown;
@@ -3072,7 +3587,7 @@ const loadContent = async (state, isTest, savedState) => {
     editingValue
   } = restoreState(savedState);
   const debugId = getDebugId(isTest);
-  return {
+  const newState = {
     ...state,
     debugId,
     debugState: Default,
@@ -3084,6 +3599,7 @@ const loadContent = async (state, isTest, savedState) => {
     focus,
     editingValue
   };
+  return updateVisibleRows(newState);
 };
 
 const loadContentLater = async state => {
@@ -3091,6 +3607,14 @@ const loadContentLater = async state => {
     debugId
   } = state;
   await start(debugId);
+  const status = await getPausedStatus(debugId);
+  if (status && status.status === 'unavailable') {
+    const newState = {
+      ...state,
+      debugState: Unavailable
+    };
+    return updateVisibleRows(newState);
+  }
   return state;
 };
 
@@ -3174,26 +3698,14 @@ const renderInputValue = (oldState, newState) => {
   } = newState;
   const selector = getFocusSelector(focus);
   if (!selector) {
-    return ['Viewlet.setValueByName', id, '', editingValue];
-  }
-  return ['Viewlet.setValueByName', id, selector, editingValue];
-};
-
-const ToolBar = 'toolbar';
-const Tree = 'tree';
-const TreeItem = 'treeitem';
-
-const SectionHeading = 1;
-const Value = 2;
-const Exception = 3;
-const Scope$1 = 4;
-const Property = 5;
-const Message = 6;
-const CallStack$1 = 7;
-const CheckBox$1 = 8;
-const WatchMessage = 9;
-const WatchExpression = 10;
-const InputField = 11;
+    return ['Viewlet.setValueByName', id, '', editingValue];
+  }
+  return ['Viewlet.setValueByName', id, selector, editingValue];
+};
+
+const ToolBar = 'toolbar';
+const Tree = 'tree';
+const TreeItem = 'treeitem';
 
 const mergeClassNames = (...classNames) => {
   return classNames.filter(Boolean).join(' ');
@@ -3212,10 +3724,7 @@ const CallStackLabel$1 = 'CallStackLabel';
 const Chevron$1 = 'Chevron';
 const DebugButton$1 = 'DebugButton';
 const DebugButtons$1 = 'DebugButtons';
-const DebugPausedMessage$1 = 'DebugPausedMessage';
 const DebugRow$1 = 'DebugRow';
-const DebugRowCallStack$1 = 'DebugRowCallStack';
-const DebugRowCheckBox$1 = 'DebugRowCheckBox';
 const DebugRowInputField$1 = 'DebugRowInputField';
 const DebugSectionAction$1 = 'DebugSectionAction';
 const DebugSectionActions$1 = 'DebugSectionActions';
@@ -3242,10 +3751,7 @@ const ClassNames = {
   Chevron: Chevron$1,
   DebugButton: DebugButton$1,
   DebugButtons: DebugButtons$1,
-  DebugPausedMessage: DebugPausedMessage$1,
   DebugRow: DebugRow$1,
-  DebugRowCallStack: DebugRowCallStack$1,
-  DebugRowCheckBox: DebugRowCheckBox$1,
   DebugRowInputField: DebugRowInputField$1,
   DebugSectionAction: DebugSectionAction$1,
   DebugSectionActions: DebugSectionActions$1,
@@ -3273,10 +3779,7 @@ const {
   Chevron,
   DebugButton,
   DebugButtons,
-  DebugPausedMessage,
   DebugRow,
-  DebugRowCallStack,
-  DebugRowCheckBox,
   DebugRowInputField,
   DebugSectionAction,
   DebugSectionActions,
@@ -3308,816 +3811,396 @@ const HandleClickScopeValue = 'handleClickScopeValue';
 const HandleClickSectionBreakPoints = 'handleClickSectionBreakPoints';
 const HandleClickSectionCallstack = 'handleClickSectionCallstack';
 const HandleClickSectionHeading = 'handleClickSectionHeading';
-const HandleClickSectionScope = 'handleClickSectionScope';
-const HandleClickSectionWatch = 'handleClickSectionWatch';
-const HandleClickStepInto = 'handleClickStepInto';
-const HandleClickStepOut = 'handleClickStepOut';
-const HandleClickStepOver = 'handleClickStepOver';
-const HandleDebugInput = 'handleDebugInput';
-const HandleClickSectionAction = 'handleClickSectionAction';
-const HandleInputFieldChange = 'handleInputFieldChange';
-const HandleInputBlur = 'handleInputBlur';
-const HandleSectionHeaderContextMenu = 'handleSectionHeaderContextMenu';
-const HandleWatchExpressionContextMenu = 'handleWatchExpressionContextMenu';
-
-// TODo use same click event listener for all debug sections
-
-const Button = 1;
-const Div = 4;
-const Input = 6;
-const Span = 8;
-const Label = 66;
-
-const getActionDom = action => {
-  const {
-    title,
-    id,
-    icon
-  } = action;
-  return [{
-    type: Button,
-    className: DebugSectionAction,
-    title,
-    onClick: HandleClickSectionAction,
-    name: id,
-    childCount: 1
-  }, text(icon)];
-};
-
-const getActionsDom = actions => {
-  if (actions.length === 0) {
-    return [];
-  }
-  return [{
-    type: Div,
-    className: DebugSectionActions,
-    childCount: actions.length
-  }, ...actions.flatMap(getActionDom)];
-};
-
-const getChevronDownVirtualDom = (extraClassName = '') => {
-  return {
-    type: Div,
-    className: `${Chevron} MaskIconChevronDown ${extraClassName}`,
-    childCount: 0
-  };
-};
-const getChevronRightVirtualDom = (extraClassName = '') => {
-  return {
-    type: Div,
-    className: `${Chevron} MaskIconChevronRight ${extraClassName}`,
-    childCount: 0
-  };
-};
-
-const renderSectionHeading = row => {
-  const {
-    expanded,
-    text: text$1,
-    key,
-    actions
-  } = row;
-  const hasActions = actions && actions.length > 0;
-  const nodes = [{
-    type: Div,
-    className: DebugSectionHeader,
-    role: TreeItem,
-    ariaExpanded: expanded,
-    ariaLevel: 1,
-    childCount: hasActions ? 3 : 2,
-    onClick: HandleClickSectionHeading,
-    onContextMenu: HandleSectionHeaderContextMenu,
-    'data-name': key
-  }, expanded ? getChevronDownVirtualDom() : getChevronRightVirtualDom(), text(text$1), ...getActionsDom(actions || [])];
-  return nodes;
-};
-
-const getArrowNodes = hasArrow => {
-  if (!hasArrow) {
-    return [];
-  }
-  return [{
-    type: Div,
-    className: CallStackArrow,
-    childCount: 1
-  }, {
-    type: Div,
-    className: 'MaskIcon MaskIconArrowRight',
-    childCount: 0
-  }];
-};
-
-const labelNode = {
-  type: Div,
-  className: CallStackLabel,
-  childCount: 1
-};
-const descriptionNode = {
-  type: Div,
-  className: CallStackDescription,
-  childCount: 1
-};
-const renderCallStack = row => {
-  const {
-    text: text$1,
-    description,
-    hasArrow,
-    index
-  } = row;
-  const childCount = hasArrow ? 3 : 2;
-  const arrowNodes = getArrowNodes(hasArrow);
-  return [{
-    type: Div,
-    className: mergeClassNames(DebugRow, DebugRowCallStack),
-    role: TreeItem,
-    ariaLevel: 2,
-    childCount,
-    onClick: HandleClickCallStackItem,
-    'data-index': index
-  }, ...arrowNodes, labelNode, text(text$1), descriptionNode, text(description)];
-};
-
-const CheckBox = 'checkbox';
-const Text = 'text';
-
-const renderCheckBox = row => {
-  const {
-    text: text$1,
-    expanded,
-    name
-  } = row;
-  return [{
-    type: Div,
-    className: mergeClassNames(DebugRow, DebugRowCheckBox),
-    role: TreeItem,
-    ariaLevel: 2,
-    childCount: 2
-  }, {
-    type: Input,
-    inputType: CheckBox,
-    name,
-    checked: expanded,
-    childCount: 0,
-    onChange: HandleClickCheckBox,
-    id: name
-  }, {
-    type: Label,
-    className: InputLabel,
-    htmlFor: name,
-    childCount: 1
-  }, text(text$1)];
-};
-
-const getDebugValueClassName = valueType => {
-  switch (valueType) {
-    case Undefined:
-      return DebugValueUndefined;
-    case Number$1:
-      return DebugValueNumber;
-    case Symbol:
-      return DebugValueSymbol;
-    case Boolean$1:
-      return DebugValueBoolean;
-    case String$1:
-      return DebugValueString;
-    case Object$1:
-      return DebugValueObject;
-    case Function:
-      return DebugValueFunction;
-    case Getter:
-      return DebugValueGetter;
-    default:
-      return '';
-  }
-};
-
-const separator = text(': ');
-
-const renderValue = row => {
-  const {
-    indent,
-    key,
-    value,
-    valueType,
-    expanded
-  } = row;
-  const className = getDebugValueClassName(valueType);
-  return [{
-    type: Div,
-    className: DebugRow,
-    role: TreeItem,
-    ariaExpanded: expanded,
-    ariaLevel: 3,
-    paddingLeft: indent,
-    onPointerDown: HandleClickScopeValue,
-    childCount: 3
-  }, {
-    type: Span,
-    className: 'DebugValue DebugPropertyKey',
-    childCount: 1
-  }, text(key), separator, {
-    type: Span,
-    className: mergeClassNames(DebugValue, className),
-    childCount: 1
-  }, text(value)];
-};
-
-const renderInputField = row => {
-  const {
-    text,
-    name
-  } = row;
-  return [{
-    type: Div,
-    className: mergeClassNames(DebugRow, DebugRowInputField),
-    role: TreeItem,
-    ariaLevel: 2,
-    childCount: 1
-  }, {
-    type: Input,
-    inputType: Text,
-    spellcheck: false,
-    autocapitalize: 'off',
-    autocorrect: 'off',
-    className: InputBox,
-    name,
-    value: text,
-    childCount: 0,
-    onInput: HandleInputFieldChange,
-    onBlur: HandleInputBlur,
-    id: name
-  }];
-};
-
-const renderScope = row => {
-  const {
-    key,
-    expanded
-  } = row;
-  const className = DebugRow;
-  return [{
-    type: Div,
-    className,
-    role: TreeItem,
-    ariaExpanded: expanded,
-    ariaLevel: 2,
-    childCount: 2,
-    onPointerDown: HandleClickScopeValue,
-    'data-name': key
-  }, expanded ? getChevronDownVirtualDom() : getChevronRightVirtualDom(), {
-    type: Span,
-    className: mergeClassNames(DebugValue, DebugValueScopeName),
-    childCount: 1
-  }, text(key)];
-};
+const HandleClickSectionScope = 'handleClickSectionScope';
+const HandleClickSectionWatch = 'handleClickSectionWatch';
+const HandleClickStepInto = 'handleClickStepInto';
+const HandleClickStepOut = 'handleClickStepOut';
+const HandleClickStepOver = 'handleClickStepOver';
+const HandleDebugInput = 'handleDebugInput';
+const HandleClickSectionAction = 'handleClickSectionAction';
+const HandleInputFieldChange = 'handleInputFieldChange';
+const HandleInputBlur = 'handleInputBlur';
+const HandleSectionHeaderContextMenu = 'handleSectionHeaderContextMenu';
+const HandleWatchExpressionContextMenu = 'handleWatchExpressionContextMenu';
+
+// TODo use same click event listener for all debug sections
+
+const Button = 1;
+const Div = 4;
+const Input = 6;
+const Span = 8;
+const Label = 66;
 
-const renderWatchExpression$1 = row => {
+const getActionDom = action => {
   const {
-    value,
-    key,
-    index
-  } = row;
+    title,
+    id,
+    icon
+  } = action;
   return [{
-    type: Div,
-    className: DebugRow,
-    role: TreeItem,
-    childCount: 4,
-    'data-index': index,
-    onClick: HandleClickWatchExpression,
-    // TODO use doubleclick
-    onContextMenu: HandleWatchExpressionContextMenu
-  }, {
-    type: Span,
-    className: DebugValueScopeName,
-    childCount: 1
-  }, text(key), separator, {
-    type: Span,
-    className: DebugValue,
-    childCount: 1
-  }, text(value), {
     type: Button,
-    title: deleteWatchExpression(),
-    className: mergeClassNames(IconButton, DebugSectionAction, DeleteWatchExpression),
-    'data-index': index,
-    onClick: HandleClickWatchExpressionDelete,
+    className: DebugSectionAction,
+    title,
+    onClick: HandleClickSectionAction,
+    name: id,
     childCount: 1
-  }, text('×')];
+  }, text(icon)];
 };
 
-const renderWatchMessage = row => {
-  const {
-    text: text$1
-  } = row;
+const getActionsDom = actions => {
+  if (actions.length === 0) {
+    return [];
+  }
   return [{
     type: Div,
-    className: 'WatchMessage',
-    childCount: 1
-  }, text(text$1)];
+    className: DebugSectionActions,
+    childCount: actions.length
+  }, ...actions.flatMap(getActionDom)];
 };
 
-const renderNoop = row => {
-  return [{
-    type: Div,
-    childCount: 1
-  }, text('unknown row type')];
-};
-const renderMessage = row => {
-  const {
-    text: text$1
-  } = row;
-  return [{
+const getChevronDownVirtualDom = (extraClassName = '') => {
+  return {
     type: Div,
-    className: DebugPausedMessage,
-    childCount: 1
-  }, text(text$1)];
-};
-
-const getRowRenderer = type => {
-  switch (type) {
-    case Message:
-      return renderMessage;
-    case SectionHeading:
-      return renderSectionHeading;
-    case CallStack$1:
-      return renderCallStack;
-    case Scope$1:
-      return renderScope;
-    case Value:
-    case Property:
-    case Exception:
-      return renderValue;
-    case CheckBox$1:
-      return renderCheckBox;
-    case WatchMessage:
-      return renderWatchMessage;
-    case WatchExpression:
-      return renderWatchExpression$1;
-    case InputField:
-      return renderInputField;
-    default:
-      return renderNoop;
-  }
-};
-
-const getRunAndDebugRowVirtualDom = row => {
-  const renderer = getRowRenderer(row.type);
-  return renderer(row);
+    className: `${Chevron} MaskIconChevronDown ${extraClassName}`,
+    childCount: 0
+  };
 };
-
-const getRunAndDebugVirtualDom2 = rows => {
-  return [{
+const getChevronRightVirtualDom = (extraClassName = '') => {
+  return {
     type: Div,
-    className: 'Viewlet RunAndDebug',
-    tabIndex: 0,
-    childCount: rows.length,
-    role: Tree
-  }, ...rows.flatMap(getRunAndDebugRowVirtualDom)];
-};
-
-const getRunAndDebugVisibleRowsBreakPoints = state => {
-  const {
-    breakPointsExpanded,
-    exceptionBreakPoints,
-    breakPointsVisible
-  } = state;
-  if (!breakPointsVisible) {
-    return [];
-  }
-  if (breakPointsExpanded) {
-    return [{
-      type: SectionHeading,
-      text: breakPoints(),
-      expanded: true,
-      key: BreakPoints,
-      value: '',
-      indent: 0,
-      valueType: '',
-      name: '',
-      description: ''
-    }, {
-      type: CheckBox$1,
-      text: pauseOnExceptions(),
-      expanded: exceptionBreakPoints === All,
-      key: '',
-      value: '',
-      indent: 0,
-      valueType: '',
-      name: PauseOnExceptions,
-      description: ''
-    }, {
-      type: CheckBox$1,
-      text: pauseOnUncaughtExceptions(),
-      expanded: exceptionBreakPoints === Uncaught,
-      key: '',
-      value: '',
-      indent: 0,
-      valueType: '',
-      name: PauseOnUncaughtExceptions,
-      description: ''
-    }];
-  }
-  return [{
-    type: SectionHeading,
-    text: breakPoints(),
-    expanded: breakPointsExpanded,
-    key: BreakPoints,
-    value: '',
-    indent: 0,
-    valueType: '',
-    name: '',
-    description: ''
-  }];
+    className: `${Chevron} MaskIconChevronRight ${extraClassName}`,
+    childCount: 0
+  };
 };
 
-const Scope = 'Scope';
-const CallStack = 'CallStack';
-const Watch = 'Watch';
-
-const formatLocation = (url, rowIndex, columnIndex) => {
-  const lastSlashIndex = url.lastIndexOf('/');
-  const adjustedRowIndex = rowIndex + 1;
-  if (lastSlashIndex === -1) {
-    return `${url}:${adjustedRowIndex}`;
-  }
-  const part = url.slice(lastSlashIndex + 1);
-  return `${part}:${adjustedRowIndex}`;
+const getDebugRowClassName = (baseClassName, isSelected) => {
+  return isSelected ? mergeClassNames(baseClassName, 'DebugRowSelected') : baseClassName;
 };
 
-const unknownScript = {
-  url: 'unknown'
-};
-const getRunAndDebugVisibleRowsCallStack = state => {
+const renderSectionHeading = (row, selectedIndex, rowIndex) => {
   const {
-    callStack: callStack$1,
-    callStackExpanded,
-    parsedScripts,
-    callStackVisible
-  } = state;
-  if (!callStackVisible) {
-    return [];
-  }
-  const rows = [];
-  if (callStackExpanded) {
-    rows.push({
-      type: SectionHeading,
-      text: callStack(),
-      expanded: true,
-      key: CallStack$2,
-      value: '',
-      indent: 0,
-      valueType: '',
-      name: CallStack,
-      description: ''
-    });
-    if (callStack$1.length === 0) {
-      rows.push({
-        type: Message,
-        text: notPaused(),
-        expanded: false,
-        key: '',
-        value: '',
-        indent: 0,
-        valueType: '',
-        name: '',
-        description: ''
-      });
-    } else {
-      for (const item of callStack$1) {
-        const {
-          scriptId,
-          lineNumber} = item.location;
-        const script = parsedScripts[scriptId] || unknownScript;
-        const description = formatLocation(script.url, lineNumber);
-        const hasArrow = item === callStack$1[0];
-        rows.push({
-          type: CallStack$1,
-          text: item.functionName,
-          expanded: false,
-          key: CallStack$2,
-          value: '',
-          indent: 0,
-          valueType: '',
-          name: '',
-          description,
-          hasArrow,
-          index: callStack$1.indexOf(item) // TODO use for loop
-        });
-      }
-    }
-  } else {
-    rows.push({
-      type: SectionHeading,
-      text: callStack(),
-      expanded: false,
-      key: '',
-      value: '',
-      indent: 0,
-      valueType: '',
-      name: CallStack,
-      description: ''
-    });
+    expanded,
+    text: text$1,
+    key,
+    actions
+  } = row;
+  const hasActions = actions && actions.length > 0;
+  const isSelected = rowIndex === selectedIndex;
+  const className = getDebugRowClassName(DebugSectionHeader, isSelected);
+  const nodes = [{
+    type: Div,
+    className,
+    role: TreeItem,
+    ariaExpanded: expanded,
+    ariaLevel: 1,
+    childCount: hasActions ? 3 : 2,
+    onClick: HandleClickSectionHeading,
+    onContextMenu: HandleSectionHeaderContextMenu,
+    'data-name': key
+  }, expanded ? getChevronDownVirtualDom() : getChevronRightVirtualDom(), text(text$1), ...getActionsDom(actions || [])];
+  return nodes;
+};
+
+const getArrowNodes = hasArrow => {
+  if (!hasArrow) {
+    return [];
   }
-  return rows;
+  return [{
+    type: Div,
+    className: CallStackArrow,
+    childCount: 1
+  }, {
+    type: Div,
+    className: 'MaskIcon MaskIconArrowRight',
+    childCount: 0
+  }];
 };
 
-const getNoopRows = () => {
-  return [];
+const labelNode = {
+  type: Div,
+  className: CallStackLabel,
+  childCount: 1
+};
+const descriptionNode = {
+  type: Div,
+  className: CallStackDescription,
+  childCount: 1
+};
+const renderCallStack = (row, selectedIndex, rowIndex) => {
+  const {
+    text: text$1,
+    description,
+    hasArrow,
+    index
+  } = row;
+  const childCount = hasArrow ? 3 : 2;
+  const arrowNodes = getArrowNodes(hasArrow);
+  const isSelected = rowIndex === selectedIndex;
+  const className = getDebugRowClassName('DebugRow DebugRowCallStack', isSelected);
+  return [{
+    type: Div,
+    className,
+    role: TreeItem,
+    ariaLevel: 2,
+    childCount,
+    onClick: HandleClickCallStackItem,
+    'data-index': index
+  }, ...arrowNodes, labelNode, text(text$1), descriptionNode, text(description)];
 };
 
-const getScopeExceptionRows = scope => {
+const CheckBox = 'checkbox';
+const Text = 'text';
+
+const renderCheckBox = (row, selectedIndex, rowIndex) => {
   const {
-    key,
-    value,
-    indent
-  } = scope;
+    text: text$1,
+    expanded,
+    name
+  } = row;
+  const isSelected = rowIndex === selectedIndex;
+  const className = getDebugRowClassName(DebugRow, isSelected);
   return [{
-    type: Exception,
-    text: '',
-    expanded: false,
-    key,
-    value,
-    indent,
-    valueType: '',
-    name: '',
-    description: ''
-  }];
+    type: Div,
+    className,
+    role: TreeItem,
+    ariaLevel: 2,
+    childCount: 2
+  }, {
+    type: Input,
+    inputType: CheckBox,
+    name,
+    checked: expanded,
+    childCount: 0,
+    onChange: HandleClickCheckBox,
+    id: name
+  }, {
+    type: Label,
+    className: InputLabel,
+    htmlFor: name,
+    childCount: 1
+  }, text(text$1)];
 };
 
-const None = 0;
-const Expanded = 1 << 0;
-const Collapsed = 1 << 1;
-const Focused = 1 << 2;
+const getDebugValueClassName = valueType => {
+  switch (valueType) {
+    case Undefined:
+      return DebugValueUndefined;
+    case Number$1:
+      return DebugValueNumber;
+    case Symbol:
+      return DebugValueSymbol;
+    case Boolean$1:
+      return DebugValueBoolean;
+    case String$1:
+      return DebugValueString;
+    case Object$1:
+      return DebugValueObject;
+    case Function:
+      return DebugValueFunction;
+    case Getter:
+      return DebugValueGetter;
+    default:
+      return '';
+  }
+};
 
-const getScopePropertyRows = scope => {
+const separator = text(': ');
+
+const renderValue = (row, selectedIndex, rowIndex) => {
   const {
     indent,
     key,
     value,
     valueType,
-    flags
-  } = scope;
+    expanded
+  } = row;
+  const isSelected = rowIndex === selectedIndex;
+  const className = getDebugRowClassName(DebugRow, isSelected);
   return [{
-    type: Property,
-    text: '',
-    expanded: Boolean(flags & Expanded),
-    key,
-    value,
-    indent,
-    valueType,
-    name: '',
-    description: ''
-  }];
+    type: Div,
+    className: className,
+    role: TreeItem,
+    ariaExpanded: expanded,
+    ariaLevel: 3,
+    paddingLeft: indent,
+    onPointerDown: HandleClickScopeValue,
+    childCount: 3
+  }, {
+    type: Span,
+    className: 'DebugValue DebugPropertyKey',
+    childCount: 1
+  }, text(key), separator, {
+    type: Span,
+    className: mergeClassNames(DebugValue, getDebugValueClassName(valueType)),
+    childCount: 1
+  }, text(value)];
 };
 
-const getScopeScopeRows = scope => {
+const renderInputField = (row, selectedIndex, rowIndex) => {
   const {
-    key,
-    flags
-  } = scope;
+    text,
+    name
+  } = row;
+  const isSelected = rowIndex === selectedIndex;
+  const className = getDebugRowClassName(`${DebugRow} ${DebugRowInputField}`, isSelected);
   return [{
-    type: Scope$1,
-    text: '',
-    expanded: Boolean(flags & Expanded),
-    key,
-    value: '',
-    indent: 0,
-    valueType: '',
-    name: '',
-    description: ''
+    type: Div,
+    className,
+    role: TreeItem,
+    ariaLevel: 2,
+    childCount: 1
+  }, {
+    type: Input,
+    inputType: Text,
+    spellcheck: false,
+    autocapitalize: 'off',
+    autocorrect: 'off',
+    className: InputBox,
+    name,
+    value: text,
+    childCount: 0,
+    onInput: HandleInputFieldChange,
+    onBlur: HandleInputBlur,
+    id: name
   }];
 };
 
-const getScopeThisRows = scope => {
+const renderScope = (row, selectedIndex, rowIndex) => {
   const {
-    indent,
-    key,
-    value,
-    valueType
-  } = scope;
-  return [{
-    type: Value,
-    text: '',
-    expanded: false,
     key,
-    value,
-    indent,
-    valueType,
-    name: '',
-    description: ''
-  }];
-};
-
-const getScopeRenderer = type => {
-  switch (type) {
-    case This:
-      return getScopeThisRows;
-    case Exception$1:
-      return getScopeExceptionRows;
-    case Scope$3:
-      return getScopeScopeRows;
-    case Property$1:
-      return getScopePropertyRows;
-    default:
-      return getNoopRows;
-  }
-};
-
-const getExpandable = valueType => {
-  if (valueType === 'object') {
-    return true;
-  }
-  return false;
-};
-const getFlags = (isExpanded, isExpandable, isFocused) => {
-  let flags = None;
-  if (isExpanded) {
-    flags |= Expanded;
-  } else if (isExpandable) {
-    flags |= Collapsed;
-  }
-  if (isFocused) {
-    flags |= Focused;
-  }
-  return flags;
-};
-const getVisibleScopeItems = (scopeChain, expandedIds, focusedIndex) => {
-  const minLineY = 0;
-  const maxLineY = scopeChain.length;
-  const visible = [];
-  for (let i = minLineY; i < maxLineY; i++) {
-    const element = scopeChain[i];
-    const isExpanded = expandedIds.includes(element.objectId);
-    const isExpandable = getExpandable(element.valueType);
-    const isFocused = i === focusedIndex;
-    const flags = getFlags(isExpanded, isExpandable, isFocused);
-    visible.push({
-      ...element,
-      flags
-    });
-  }
-  return visible;
+    expanded
+  } = row;
+  const isSelected = rowIndex === selectedIndex;
+  const className = getDebugRowClassName(DebugRow, isSelected);
+  return [{
+    type: Div,
+    className,
+    role: TreeItem,
+    ariaExpanded: expanded,
+    ariaLevel: 2,
+    childCount: 2,
+    onPointerDown: HandleClickScopeValue,
+    'data-name': key
+  }, expanded ? getChevronDownVirtualDom() : getChevronRightVirtualDom(), {
+    type: Span,
+    className: mergeClassNames(DebugValue, DebugValueScopeName),
+    childCount: 1
+  }, text(key)];
 };
 
-const getRunAndDebugVisibleRowsScope = state => {
+const renderWatchExpression = (row, selectedIndex, rowIndex) => {
   const {
-    scopeChain,
-    scopeExpanded,
-    expandedIds,
-    scopeFocusedIndex,
-    scopeVisible,
-    debugState
-  } = state;
-  if (!scopeVisible) {
-    return [];
-  }
-  const rows = [];
-  if (scopeExpanded) {
-    rows.push({
-      type: SectionHeading,
-      text: scope(),
-      expanded: true,
-      key: Scope$2,
-      value: '',
-      indent: 0,
-      valueType: '',
-      name: Scope,
-      description: ''
-    });
-    if (debugState === Paused) {
-      const visible = getVisibleScopeItems(scopeChain, expandedIds, scopeFocusedIndex);
-      for (const scope of visible) {
-        const renderer = getScopeRenderer(scope.type);
-        rows.push(...renderer(scope));
-      }
-    } else {
-      rows.push({
-        type: Message,
-        text: notPaused(),
-        expanded: false,
-        key: '',
-        value: '',
-        indent: 0,
-        valueType: '',
-        name: '',
-        description: ''
-      });
-    }
-  } else {
-    rows.push({
-      type: SectionHeading,
-      text: scope(),
-      expanded: false,
-      key: Scope$2,
-      value: '',
-      indent: 0,
-      valueType: '',
-      name: Scope,
-      description: ''
-    });
-  }
-  return rows;
+    value,
+    key,
+    index
+  } = row;
+  const isSelected = rowIndex === selectedIndex;
+  const className = getDebugRowClassName(DebugRow, isSelected);
+  return [{
+    type: Div,
+    className,
+    role: TreeItem,
+    childCount: 4,
+    'data-index': index,
+    onClick: HandleClickWatchExpression,
+    // TODO use doubleclick
+    onContextMenu: HandleWatchExpressionContextMenu
+  }, {
+    type: Span,
+    className: DebugValueScopeName,
+    childCount: 1
+  }, text(key), separator, {
+    type: Span,
+    className: DebugValue,
+    childCount: 1
+  }, text(value), {
+    type: Button,
+    title: deleteWatchExpression(),
+    className: mergeClassNames(IconButton, DebugSectionAction, DeleteWatchExpression),
+    'data-index': index,
+    onClick: HandleClickWatchExpressionDelete,
+    childCount: 1
+  }, text('×')];
 };
 
-const formatValue = value => {
-  return value === null || value === undefined ? '' : String(value);
+const renderWatchMessage = (row, selectedIndex, rowIndex) => {
+  const {
+    text: text$1
+  } = row;
+  const isSelected = rowIndex === selectedIndex;
+  const className = getDebugRowClassName('WatchMessage', isSelected);
+  return [{
+    type: Div,
+    className,
+    childCount: 1
+  }, text(text$1)];
 };
-const renderWatchExpression = (expression, value, isEditing, index) => {
-  if (isEditing) {
-    return {
-      type: InputField,
-      text: '',
-      expanded: false,
-      key: 'new-watch-expression',
-      value: '',
-      indent: 0,
-      valueType: '',
-      name: WatchExpressionInput,
-      description: '',
-      index
-    };
-  }
-  return {
-    type: WatchExpression,
-    text: expression,
-    expanded: false,
-    key: expression,
-    value: formatValue(value),
-    indent: 0,
-    valueType: '',
-    name: '',
-    description: '',
-    index
-  };
+
+const renderNoop = (row, selectedIndex, rowIndex) => {
+  const isSelected = rowIndex === selectedIndex;
+  const className = getDebugRowClassName(DebugRow, isSelected);
+  return [{
+    type: Div,
+    className,
+    childCount: 1
+  }, text('unknown row type')];
 };
-const getRunAndDebugVisibleRowsWatchContent = watchExpressions => {
-  const rows = [];
-  if (watchExpressions.length === 0) {
-    rows.push({
-      type: WatchMessage,
-      text: noWatchExpression(),
-      expanded: false,
-      key: '',
-      value: '',
-      indent: 0,
-      valueType: '',
-      name: '',
-      description: ''
-    });
-  } else {
-    for (const watchExpression of watchExpressions) {
-      // TODO simplify index
-      const index = watchExpressions.indexOf(watchExpression);
-      rows.push(renderWatchExpression(watchExpression.expression, watchExpression.value, watchExpression.isEditing || false, index));
-    }
-  }
-  return rows;
+const renderMessage = (row, selectedIndex, rowIndex) => {
+  const isSelected = rowIndex === selectedIndex;
+  const className = getDebugRowClassName('DebugPausedMessage', isSelected);
+  return [{
+    type: Div,
+    className,
+    childCount: 1
+  }, text(row.text)];
 };
 
-const getWatchActions = watchExpanded => {
-  if (!watchExpanded) {
-    return [];
+const getRowRenderer = type => {
+  switch (type) {
+    case Message:
+      return renderMessage;
+    case SectionHeading:
+      return renderSectionHeading;
+    case CallStack$2:
+      return renderCallStack;
+    case Scope$2:
+      return renderScope;
+    case Value:
+    case Property:
+    case Exception:
+      return renderValue;
+    case CheckBox$1:
+      return renderCheckBox;
+    case WatchMessage:
+      return renderWatchMessage;
+    case WatchExpression:
+      return renderWatchExpression;
+    case InputField:
+      return renderInputField;
+    default:
+      return renderNoop;
   }
-  return [{
-    id: AddWatchExpression,
-    title: 'Add new watch expression',
-    icon: '+'
-  }];
 };
 
-const getRunAndDebugVisibleRowsWatch = state => {
-  const {
-    watchExpanded,
-    watchExpressions,
-    watchVisible
-  } = state;
-  if (!watchVisible) {
-    return [];
-  }
-  const rows = [{
-    type: SectionHeading,
-    text: watch(),
-    expanded: watchExpanded,
-    key: Watch$1,
-    value: '',
-    indent: 0,
-    valueType: '',
-    name: Watch,
-    description: '',
-    actions: getWatchActions(watchExpanded)
-  }];
-  if (watchExpanded) {
-    rows.push(...getRunAndDebugVisibleRowsWatchContent(watchExpressions));
-  }
-  return rows;
+const getRunAndDebugRowVirtualDom = (row, selectedIndex, rowIndex) => {
+  const renderer = getRowRenderer(row.type);
+  return renderer(row, selectedIndex, rowIndex);
 };
 
-const getRunAndDebugVisibleRows = state => {
-  return [...getRunAndDebugVisibleRowsWatch(state), ...getRunAndDebugVisibleRowsBreakPoints(state), ...getRunAndDebugVisibleRowsScope(state), ...getRunAndDebugVisibleRowsCallStack(state)];
+const getRunAndDebugVirtualDom2 = (rows, selectedIndex) => {
+  return [{
+    type: Div,
+    className: 'Viewlet RunAndDebug',
+    tabIndex: 0,
+    childCount: rows.length,
+    role: Tree
+  }, ...rows.flatMap((row, index) => getRunAndDebugRowVirtualDom(row, selectedIndex, index))];
 };
 
 const renderItems = (oldState, newState) => {
-  const rows = getRunAndDebugVisibleRows(newState);
-  const dom = getRunAndDebugVirtualDom2(rows);
+  const rows = newState.visibleRows;
+  const selectedIndex = newState.selectedIndex;
+  const dom = getRunAndDebugVirtualDom2(rows, selectedIndex);
   return ['Viewlet.setDom2', newState.id, dom];
 };
 
@@ -4177,6 +4260,9 @@ const DebugRestart = 'DebugRestart';
 const DebugStop = 'DebugStop';
 
 const getDebugButtons = debugState => {
+  if (debugState === Unavailable) {
+    return [];
+  }
   const debugButtons = [];
   if (debugState === Paused) {
     debugButtons.push({
@@ -4252,8 +4338,12 @@ const renderActions = uid => {
     newState
   } = get(uid);
   const {
-    scopeExpanded
+    scopeExpanded,
+    debugState
   } = newState;
+  if (debugState === Unavailable) {
+    return [];
+  }
   if (scopeExpanded) {
     return getRunAndDebugButtonsVirtualDom(newState.debugState);
   }
@@ -4380,6 +4470,42 @@ const saveState = (uid, reason) => {
   };
 };
 
+const selectIndex = (state, index) => {
+  const {
+    visibleRows
+  } = state;
+  const maxIndex = visibleRows.length - 1;
+  const clampedIndex = Math.max(-1, Math.min(index, maxIndex));
+  return {
+    ...state,
+    selectedIndex: clampedIndex
+  };
+};
+
+const selectNextRow = state => {
+  const {
+    selectedIndex,
+    visibleRows
+  } = state;
+  const maxIndex = visibleRows.length - 1;
+  const newIndex = Math.min(maxIndex, selectedIndex + 1);
+  return {
+    ...state,
+    selectedIndex: newIndex
+  };
+};
+
+const selectPreviousRow = state => {
+  const {
+    selectedIndex
+  } = state;
+  const newIndex = Math.max(-1, selectedIndex - 1);
+  return {
+    ...state,
+    selectedIndex: newIndex
+  };
+};
+
 const showCallStack = state => {
   return {
     ...state,
@@ -4461,6 +4587,7 @@ const commandMap = {
   'RunAndDebug.pause': wrapCommand(pause),
   'RunAndDebug.readFile': readFile,
   'RunAndDebug.refresh': wrapCommand(refresh),
+  'RunAndDebug.refreshWatchExpression': wrapCommand(refreshWatchExpression),
   'RunAndDebug.removeWatchExpression': removeWatchExpression,
   'RunAndDebug.render2': render2,
   'RunAndDebug.renderActions': renderActions,
@@ -4469,6 +4596,9 @@ const commandMap = {
   'RunAndDebug.restoreState': restoreState,
   'RunAndDebug.resume': wrapCommand(resume),
   'RunAndDebug.saveState': saveState,
+  'RunAndDebug.selectIndex': wrapCommand(selectIndex),
+  'RunAndDebug.selectNextRow': wrapCommand(selectNextRow),
+  'RunAndDebug.selectPreviousRow': wrapCommand(selectPreviousRow),
   'RunAndDebug.setPauseOnExceptions': wrapCommand(setPauseOnExceptions),
   'RunAndDebug.stepInto': wrapCommand(stepInto),
   'RunAndDebug.stepOut': wrapCommand(stepOut),