@lvce-editor/static-server 0.53.6 → 0.53.7

package/static/{f429d0a → 92d11f3}/packages/debug-worker/dist/debugWorkerMain.js

@@ -1000,7 +1000,7 @@ const Default = 2;
 const Unavailable = 3;
 
 const rpcs = Object.create(null);
-const set$d = (id, rpc) => {
+const set$f = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get$1 = id => {
@@ -1024,7 +1024,7 @@ const create$2 = rpcId => {
       return rpc.invokeAndTransfer(method, ...params);
     },
     set(rpc) {
-      set$d(rpcId, rpc);
+      set$f(rpcId, rpc);
     },
     async dispose() {
       const rpc = get$1(rpcId);
@@ -1040,28 +1040,25 @@ const RpcId = {
   __proto__: null,
   DebugWorker: DebugWorker$1};
 const {
-  invoke: invoke$b,
-  set: set$b
-} = create$2(EditorWorker$1);
+  invoke: invoke$c,
+  set: set$c} = create$2(EditorWorker$1);
 const EditorWorker = {
   __proto__: null,
-  invoke: invoke$b,
-  set: set$b
+  invoke: invoke$c,
+  set: set$c
 };
 const {
-  invoke: invoke$8,
-  set: set$8
-} = create$2(ExtensionHostWorker);
+  invoke: invoke$9,
+  set: set$9} = create$2(ExtensionHostWorker);
 const ExtensionHost = {
   __proto__: null,
-  invoke: invoke$8,
-  set: set$8
+  invoke: invoke$9,
+  set: set$9
 };
 const {
   invoke: invoke$3,
   invokeAndTransfer: invokeAndTransfer$3,
-  set: set$3$1
-} = create$2(RendererWorker$1);
+  set: set$3$1} = create$2(RendererWorker$1);
 const RendererWorker = {
   __proto__: null,
   invoke: invoke$3,
@@ -1081,8 +1078,7 @@ const activateByEvent = event => {
 
 const {
   invoke: invoke$1,
-  set: set$2
-} = ExtensionHost;
+  set: set$2} = ExtensionHost;
 
 const executeProvider = async ({
   event,
@@ -1193,8 +1189,7 @@ const getScripts = debugId => {
 
 const {
   invoke,
-  set: set$1
-} = EditorWorker;
+  set: set$1} = EditorWorker;
 
 const getDebugUri = (key, scriptId) => {
   const uri = `debug:///${key}/${scriptId}`;
@@ -1413,444 +1408,106 @@ const getNewWatchExpressionsAccept = async (debugId, callFrameId, debugState, wa
   return newWatchExpressions2;
 };
 
-const acceptWatchExpressionEdit = async state => {
-  const {
-    watchExpressions,
-    editingValue,
-    debugId,
-    debugState,
-    callFrameId
-  } = state;
-  const newWatchExpressions = await getNewWatchExpressionsAccept(debugId, callFrameId, debugState, watchExpressions, editingValue);
-  return {
-    ...state,
-    watchExpressions: newWatchExpressions,
-    focus: 0,
-    editingValue: '',
-    editingselectionstart: 0,
-    editingselectionend: 0
-  };
-};
-
-const FocusDebugWatchInput = 1290;
-const FocusDebugRow = 1299;
-
-const addWatchExpression$1 = async (state, expression) => {
-  const {
-    watchExpressions
-  } = state;
-  const watchExpression = {
-    expression,
-    value: null,
-    isEditing: true
-  };
-  const newWatchExpressions1 = [...watchExpressions, watchExpression];
-  return {
-    ...state,
-    watchExpressions: newWatchExpressions1,
-    focus: FocusDebugWatchInput,
-    editingselectionstart: 0,
-    editingselectionend: expression.length
-  };
-};
+const SectionHeading = 1;
+const Value = 2;
+const Exception$2 = 3;
+const Scope$4 = 4;
+const Property$1 = 5;
+const Message = 6;
+const CallStack$3 = 7;
+const CheckBox$1 = 8;
+const WatchMessage = 9;
+const WatchExpression = 10;
+const InputField = 11;
 
-const getNewWatchExpressionsCancel = watchExpressions => {
-  const lastExpression = watchExpressions[watchExpressions.length - 1];
-  if (lastExpression && lastExpression.expression === '') {
-    return watchExpressions.toSpliced(-1, 1);
+const emptyObject = {};
+const RE_PLACEHOLDER = /\{(PH\d+)\}/g;
+const i18nString = (key, placeholders = emptyObject) => {
+  if (placeholders === emptyObject) {
+    return key;
   }
-  return watchExpressions;
-};
-
-const cancelWatchExpressionEdit = state => {
-  const {
-    watchExpressions
-  } = state;
-  const newWatchExpressions = getNewWatchExpressionsCancel(watchExpressions);
-  return {
-    ...state,
-    watchExpressions: newWatchExpressions,
-    focus: 0,
-    editingselectionstart: 0,
-    editingselectionend: 0
+  const replacer = (match, rest) => {
+    return placeholders[rest];
   };
+  return key.replaceAll(RE_PLACEHOLDER, replacer);
 };
 
-const None$5 = 'none';
-const Exception$2 = 'exception';
-const Other = 'other';
-
-const All = 1;
-const Uncaught = 2;
-const None$4 = 0;
-
-const None$3 = 'none';
+const Block$1 = 'Block';
+const BreakPoints$2 = 'BreakPoints';
+const CallStack$2 = 'Call Stack';
+const Catch$1 = '`Catch` block';
+const Closure$1 = 'Closure';
+const DebuggerPaused = 'Debugger paused';
+const DebuggerPausedOnException = 'Paused on exception';
+const Eval$1 = 'Eval';
+const Expression = 'Expression';
+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';
+const Resume = 'Resume';
+const Scope$3 = 'Scope';
+const Script$2 = 'Script';
+const StepInto = 'Step Into';
+const StepOut = 'Step Out';
+const StepOver = 'Step Over';
+const Stop = 'Stop';
+const Watch$2 = 'Watch';
+const With$1 = '`With` block';
+const PauseOnExceptions$1 = 'Pause on Exceptions';
+const PauseOnUncaughtExceptions$1 = 'Pause on uncaught Exceptions';
+const NoWatchExpression = 'No Watch Expression';
+const DeleteWatchExpression$2 = 'Delete Watch Expression';
+const DeleteAllWatchExpressions = 'Delete All Watch Expressions';
+const AddWatchExpression$1 = 'Add Watch Expression';
 
-const create = (id, uri, x, y, width, height) => {
-  const state = {
-    id,
-    disposed: false,
-    processes: [],
-    debugState: None$6,
-    watchExpanded: false,
-    breakPointsExpanded: false,
-    scopeExpanded: false,
-    callStackExpanded: false,
-    watchVisible: true,
-    breakPointsVisible: true,
-    scopeVisible: true,
-    callStackVisible: true,
-    scopeChain: [],
-    callStack: [],
-    parsedScripts: Object.create(null),
-    pausedReason: None$5,
-    pausedMessage: '',
-    debugInputValue: '',
-    debugOutputValue: '',
-    callFrameId: '',
-    expandedIds: [],
-    scopeFocusedIndex: -1,
-    focusedIndex: -1,
-    pauseOnExceptionState: None$3,
-    cache: Object.create(null),
-    // TODO maybe store cache in extension host worker
-    exceptionBreakPoints: None$4,
-    watchExpressions: [],
-    focus: 0,
-    editingValue: '',
-    debugId: 0,
-    inputSource: 0,
-    editingselectionstart: 0,
-    editingselectionend: 0,
-    openFilesOnPause: true,
-    maxDescriptionLength: 100,
-    selectedIndex: -1,
-    visibleRows: []
-  };
-  set(id, state, state);
+const local = () => {
+  return i18nString(Local$1);
 };
-
-const deleteAllWatchExpressions$1 = state => {
-  return {
-    ...state,
-    watchExpressions: []
-  };
+const namedClosure = name => {
+  return i18nString(NamedClosure, {
+    PH1: name
+  });
 };
-
-const deleteWatchExpression$1 = (state, index) => {
-  if (index < 0 || index >= state.watchExpressions.length) {
-    return state;
-  }
-  return {
-    ...state,
-    watchExpressions: state.watchExpressions.toSpliced(index, 1)
-  };
+const closure = () => {
+  return i18nString(Closure$1);
 };
-
-const isEqual$5 = (oldState, newState) => {
-  return oldState.focus === newState.focus;
+const global = () => {
+  return i18nString(Global$1);
 };
-
-const isEqual$4 = (oldState, newState) => {
-  if (!newState.focus) {
-    return true;
-  }
-  return oldState.focus === newState.focus;
+const block = () => {
+  return i18nString(Block$1);
 };
-
-const RenderItems = 1;
-const RenderFocus = 2;
-const RenderValue = 3;
-const RenderFocusContext = 7;
-const RenderSelection = 8;
-const RenderPauseOnExceptions = 9;
-
-const diffType$1 = RenderItems;
-const isEqual$3 = (oldState, newState) => {
-  return oldState.breakPointsExpanded === newState.breakPointsExpanded && oldState.callFrameId === newState.callFrameId && oldState.callStackExpanded === newState.callStackExpanded && oldState.debugState === newState.debugState && oldState.scopeChain === newState.scopeChain && oldState.scopeExpanded === newState.scopeExpanded && oldState.selectedIndex === newState.selectedIndex && oldState.visibleRows === newState.visibleRows && oldState.watchExpanded === newState.watchExpanded && oldState.watchExpressions === newState.watchExpressions;
+const expression = () => {
+  return i18nString(Expression);
 };
-
-const diffType = RenderPauseOnExceptions;
-const isEqual$2 = (oldState, newState) => {
-  return oldState.exceptionBreakPoints === newState.exceptionBreakPoints;
+const module2 = () => {
+  return i18nString(Module$1);
 };
-
-const isEqual$1 = (oldState, newState) => {
-  return oldState.editingselectionstart === newState.editingselectionstart && oldState.editingselectionend === newState.editingselectionend;
+const evalScope = () => {
+  return i18nString(Eval$1);
 };
-
-const Script$2 = 2;
-
-const isEqual = (oldState, newState) => {
-  if (newState.inputSource === Script$2) {
-    return newState.editingValue.length === 0;
-  }
-  return true;
+const script = () => {
+  return i18nString(Script$2);
 };
-
-const modules = [isEqual$3, isEqual$4, isEqual, isEqual$5, isEqual$1, isEqual$2];
-const numbers = [diffType$1, RenderFocusContext, RenderValue, RenderFocus, RenderSelection, diffType];
-
-const diff = (oldState, newState) => {
-  const diffResult = [];
-  for (let i = 0; i < modules.length; i++) {
-    const fn = modules[i];
-    if (!fn(oldState, newState)) {
-      diffResult.push(numbers[i]);
-    }
-  }
-  return diffResult;
+const withScope = () => {
+  return i18nString(With$1);
 };
-
-const diff2 = uid => {
-  const {
-    oldState,
-    newState
-  } = get(uid);
-  const diffResult = diff(oldState, newState);
-  return diffResult;
+const catchScope = () => {
+  return i18nString(Catch$1);
 };
-
-const dispose = async uid => {
-  dispose$1(uid);
+const debuggerPaused = () => {
+  return i18nString(DebuggerPaused);
 };
-
-const commandIds = ['acceptWatchExpressionEdit', 'addWatchExpression', 'cancelWatchExpressionEdit', 'create', 'deleteAllWatchExpressions', 'deleteWatchExpression', 'diff2', 'dispose', 'focusNext', 'focusPrevious', 'getCommandIds', 'getKeyBindings', 'handleArrowDown', 'handleArrowLeft', 'handleArrowRight', 'handleArrowUp', 'handleChange', 'handleClickCallStackItem', 'handleClickCheckBox', 'handleClickDebugButton', 'handleClickPauseOnExceptions', 'handleClickPauseOnUncaughtExceptions', 'handleClickScopeValue', 'handleClickSectionAction', 'handleClickSectionBreakPoints', 'handleClickSectionCallstack', 'handleClickSectionHeading', 'handleClickSectionScope', 'handleClickSectionWatch', 'handleClickWatchExpression', 'handleClickWatchExpressionDelete', 'handleDebugInput', 'handleEnter', 'handleEvaluate', 'handleInputBlur', 'handleInputFieldChange', 'handlePaused', 'handleResumed', 'handleScriptParsed', 'handleSectionHeaderContextMenu', 'handleSpace', 'handleWatchExpressionContextMenu', 'handleWatchExpressionDoubleClick', 'handleWatchValueChange', 'hideCallStack', 'hideScope', 'hideWatch', 'loadContent', 'loadContentLater', 'pause', 'refresh', 'refreshWatchExpression', 'removeWatchExpression', 'render2', 'renderActions', 'renderEventListeners', 'resize', 'restoreState', 'resume', 'selectIndex', 'selectNextRow', 'selectPreviousRow', 'setPauseOnExceptions', 'showCallStack', 'showScope', 'showWatch', 'stepInto', 'stepOut', 'stepOver', 'terminate', 'togglePause'];
-
-const getCommandIds = () => {
-  return commandIds;
+const debuggerPausedOnException = () => {
+  return i18nString(DebuggerPausedOnException);
 };
-
-const emptyHighlight = {
-  uri: '',
-  rowIndex: 0,
-  columnIndex: 0
-};
-const getHighlight = uid => {
-  const state = get(uid);
-  if (!state) {
-    return emptyHighlight;
-  }
-  const {
-    newState
-  } = state;
-  const {
-    parsedScripts,
-    callStack
-  } = newState;
-  if (callStack.length === 0) {
-    return emptyHighlight;
-  }
-  const top = callStack[0];
-  const {
-    location
-  } = top;
-  const {
-    scriptId,
-    lineNumber,
-    columnNumber
-  } = location;
-  const script = parsedScripts[scriptId];
-  if (!script) {
-    return emptyHighlight;
-  }
-  return {
-    uri: script.url,
-    rowIndex: lineNumber,
-    columnIndex: columnNumber
-  };
-};
-
-const Enter = 3;
-const Escape = 8;
-const Space$1 = 9;
-const End = 255;
-const Home = 12;
-const LeftArrow = 13;
-const UpArrow = 14;
-const RightArrow = 15;
-const DownArrow = 16;
-const Delete = 18;
-const KeyC = 31;
-const KeyV = 50;
-const F2 = 58;
-const Backslash = 91;
-const Star = 131;
-
-const CtrlCmd = 1 << 11 >>> 0;
-const Alt = 1 << 9 >>> 0;
-
-const getKeyBindings = () => {
-  return [{
-    key: Backslash | CtrlCmd,
-    command: 'Run And Debug.togglePause'
-  }, {
-    key: LeftArrow,
-    command: 'Run And Debug.handleArrowLeft',
-    when: FocusDebugRow
-  }, {
-    key: RightArrow,
-    command: 'Run And Debug.handleArrowRight',
-    when: FocusDebugRow
-  }, {
-    key: Home,
-    command: 'Run And Debug.focusFirst',
-    when: FocusDebugRow
-  }, {
-    key: End,
-    command: 'Run And Debug.focusLast',
-    when: FocusDebugRow
-  }, {
-    key: UpArrow,
-    command: 'Run And Debug.selectPreviousRow',
-    when: FocusDebugRow
-  }, {
-    key: DownArrow,
-    command: 'Run And Debug.selectNextRow',
-    when: FocusDebugRow
-  }, {
-    key: CtrlCmd | Star,
-    command: 'Run And Debug.expandAll',
-    when: FocusDebugRow
-  }, {
-    key: Alt | RightArrow,
-    command: 'Run And Debug.expandRecursively',
-    when: FocusDebugRow
-  }, {
-    key: CtrlCmd | LeftArrow,
-    command: 'Run And Debug.collapseAll',
-    when: FocusDebugRow
-  }, {
-    key: CtrlCmd | KeyV,
-    command: 'Run And Debug.handlePaste',
-    when: FocusDebugRow
-  }, {
-    key: CtrlCmd | KeyC,
-    command: 'Run And Debug.handleCopy',
-    when: FocusDebugRow
-  }, {
-    key: F2,
-    command: 'Run And Debug.rename',
-    when: FocusDebugRow
-  }, {
-    key: Delete,
-    command: 'Run And Debug.removeDirent',
-    when: FocusDebugRow
-  }, {
-    key: Escape,
-    command: 'Run And Debug.focusNone',
-    when: FocusDebugRow
-  }, {
-    key: Enter,
-    command: 'Run And Debug.handleClickCurrent',
-    when: FocusDebugRow
-  }, {
-    key: Space$1,
-    command: 'Run And Debug.handleSpace',
-    when: FocusDebugRow
-  }, {
-    key: Enter,
-    command: 'Run And Debug.handleEnter',
-    when: FocusDebugRow
-  }, {
-    key: Escape,
-    command: 'Run And Debug.cancelWatchExpressionEdit',
-    when: FocusDebugWatchInput
-  }, {
-    key: Enter,
-    command: 'Run And Debug.acceptWatchExpressionEdit',
-    when: FocusDebugWatchInput
-  }];
-};
-
-const emptyObject = {};
-const RE_PLACEHOLDER = /\{(PH\d+)\}/g;
-const i18nString = (key, placeholders = emptyObject) => {
-  if (placeholders === emptyObject) {
-    return key;
-  }
-  const replacer = (match, rest) => {
-    return placeholders[rest];
-  };
-  return key.replaceAll(RE_PLACEHOLDER, replacer);
-};
-
-const Block$1 = 'Block';
-const BreakPoints$2 = 'BreakPoints';
-const CallStack$3 = 'Call Stack';
-const Catch$1 = '`Catch` block';
-const Closure$1 = 'Closure';
-const DebuggerPaused = 'Debugger paused';
-const DebuggerPausedOnException = 'Paused on exception';
-const Eval$1 = 'Eval';
-const Expression = 'Expression';
-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';
-const Resume = 'Resume';
-const Scope$4 = 'Scope';
-const Script$1 = 'Script';
-const StepInto = 'Step Into';
-const StepOut = 'Step Out';
-const StepOver = 'Step Over';
-const Stop = 'Stop';
-const Watch$2 = 'Watch';
-const With$1 = '`With` block';
-const PauseOnExceptions$1 = 'Pause on Exceptions';
-const PauseOnUncaughtExceptions$1 = 'Pause on uncaught Exceptions';
-const NoWatchExpression = 'No Watch Expression';
-const DeleteWatchExpression$2 = 'Delete Watch Expression';
-const DeleteAllWatchExpressions = 'Delete All Watch Expressions';
-const AddWatchExpression$1 = 'Add Watch Expression';
-
-const local = () => {
-  return i18nString(Local$1);
-};
-const namedClosure = name => {
-  return i18nString(NamedClosure, {
-    PH1: name
-  });
-};
-const closure = () => {
-  return i18nString(Closure$1);
-};
-const global = () => {
-  return i18nString(Global$1);
-};
-const block = () => {
-  return i18nString(Block$1);
-};
-const expression = () => {
-  return i18nString(Expression);
-};
-const module2 = () => {
-  return i18nString(Module$1);
-};
-const evalScope = () => {
-  return i18nString(Eval$1);
-};
-const script = () => {
-  return i18nString(Script$1);
-};
-const withScope = () => {
-  return i18nString(With$1);
-};
-const catchScope = () => {
-  return i18nString(Catch$1);
-};
-const debuggerPaused = () => {
-  return i18nString(DebuggerPaused);
-};
-const debuggerPausedOnException = () => {
-  return i18nString(DebuggerPausedOnException);
-};
-const stepInto$1 = () => {
-  return i18nString(StepInto);
+const stepInto$1 = () => {
+  return i18nString(StepInto);
 };
 const stepOver$1 = () => {
   return i18nString(StepOver);
@@ -1868,10 +1525,10 @@ const breakPoints = () => {
   return i18nString(BreakPoints$2);
 };
 const scope = () => {
-  return i18nString(Scope$4);
+  return i18nString(Scope$3);
 };
 const callStack = () => {
-  return i18nString(CallStack$3);
+  return i18nString(CallStack$2);
 };
 const notPaused = () => {
   return i18nString(NotPaused);
@@ -1894,65 +1551,19 @@ const pauseOnUncaughtExceptions = () => {
 const noWatchExpression = () => {
   return i18nString(NoWatchExpression);
 };
-const deleteWatchExpression = () => {
+const deleteWatchExpression$1 = () => {
   return i18nString(DeleteWatchExpression$2);
 };
-const deleteAllWatchExpressions = () => {
+const deleteAllWatchExpressions$1 = () => {
   return i18nString(DeleteAllWatchExpressions);
 };
-const addWatchExpression = () => {
+const addWatchExpression$1 = () => {
   return i18nString(AddWatchExpression$1);
 };
 const noScriptRunning = () => {
   return i18nString(NoScriptRunning);
 };
 
-const None$2 = 0;
-
-const getMenuEntriesWatchExpression = () => {
-  const addMenuEntry = {
-    id: 'addWatchExpression',
-    label: addWatchExpression(),
-    flags: None$2,
-    command: 'RunAndDebug.addWatchExpression'
-  };
-  const deleteMenuEntry = {
-    id: 'deleteWatchExpression',
-    label: deleteWatchExpression(),
-    flags: None$2,
-    command: 'RunAndDebug.deleteWatchExpression'
-  };
-  const deleteAllMenuEntry = {
-    id: 'deleteAllWatchExpressions',
-    label: deleteAllWatchExpressions(),
-    flags: None$2,
-    command: 'RunAndDebug.deleteAllWatchExpressions'
-  };
-  return [addMenuEntry, deleteMenuEntry, deleteAllMenuEntry];
-};
-
-const DebugWatchExpression = 21_900;
-const DebugWatchSectionHeading = 21_901;
-
-const getMenuEntries = () => {
-  return [{
-    id: DebugWatchExpression,
-    entries: getMenuEntriesWatchExpression()
-  }];
-};
-
-const SectionHeading = 1;
-const Value = 2;
-const Exception$1 = 3;
-const Scope$3 = 4;
-const Property$1 = 5;
-const Message = 6;
-const CallStack$2 = 7;
-const CheckBox$1 = 8;
-const WatchMessage = 9;
-const WatchExpression = 10;
-const InputField = 11;
-
 const Scope$2 = 'Scope';
 const CallStack$1 = 'CallStack';
 const Watch$1 = 'Watch';
@@ -1963,7 +1574,11 @@ const CallStack = 'callstack';
 const Scope$1 = 'scope';
 const Watch = 'watch';
 
-const AddWatchExpression = 'AddWatchExpression';
+const All = 1;
+const Uncaught = 2;
+const None$5 = 0;
+
+const AddWatchExpression = 'AddWatchExpression';
 const WatchExpressionInput = 'WatchExpressionInput';
 const DebugPause$1 = 'DebugPause';
 const DebugRestart$1 = 'DebugRestart';
@@ -2088,7 +1703,7 @@ const getRunAndDebugVisibleRowsCallStack = state => {
         const description = formatLocation(script.url, lineNumber);
         const hasArrow = item === callStack$1[0];
         rows.push({
-          type: CallStack$2,
+          type: CallStack$3,
           text: item.functionName,
           expanded: false,
           key: CallStack,
@@ -2121,7 +1736,7 @@ const getRunAndDebugVisibleRowsCallStack = state => {
 const Scope = 1;
 const This = 2;
 const Property = 3;
-const Exception = 4;
+const Exception$1 = 4;
 
 const getNoopRows = () => {
   return [];
@@ -2134,7 +1749,7 @@ const getScopeExceptionRows = scope => {
     indent
   } = scope;
   return [{
-    type: Exception$1,
+    type: Exception$2,
     text: '',
     expanded: false,
     key,
@@ -2146,7 +1761,7 @@ const getScopeExceptionRows = scope => {
   }];
 };
 
-const None$1 = 0;
+const None$4 = 0;
 const Expanded = 1 << 0;
 const Collapsed = 1 << 1;
 const Focused = 1 << 2;
@@ -2178,7 +1793,7 @@ const getScopeScopeRows = scope => {
     flags
   } = scope;
   return [{
-    type: Scope$3,
+    type: Scope$4,
     text: '',
     expanded: Boolean(flags & Expanded),
     key,
@@ -2214,7 +1829,7 @@ const getScopeRenderer = type => {
   switch (type) {
     case This:
       return getScopeThisRows;
-    case Exception:
+    case Exception$1:
       return getScopeExceptionRows;
     case Scope:
       return getScopeScopeRows;
@@ -2232,7 +1847,7 @@ const getExpandable = valueType => {
   return false;
 };
 const getFlags = (isExpanded, isExpandable, isFocused) => {
-  let flags = None$1;
+  let flags = None$4;
   if (isExpanded) {
     flags |= Expanded;
   } else if (isExpandable) {
@@ -2340,99 +1955,496 @@ const renderWatchExpression$1 = (expression, value, isEditing, index) => {
     };
   }
   return {
-    type: WatchExpression,
-    text: expression,
-    expanded: false,
-    key: expression,
-    value: formatValue(value),
-    indent: 0,
-    valueType: '',
-    name: '',
-    description: '',
-    index
+    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 acceptWatchExpressionEdit = async state => {
+  const {
+    watchExpressions,
+    editingValue,
+    debugId,
+    debugState,
+    callFrameId
+  } = state;
+  const newWatchExpressions = await getNewWatchExpressionsAccept(debugId, callFrameId, debugState, watchExpressions, editingValue);
+  if (watchExpressions === newWatchExpressions) {
+    return state;
+  }
+  const newState = {
+    ...state,
+    watchExpressions: newWatchExpressions,
+    focus: 0,
+    editingValue: '',
+    editingselectionstart: 0,
+    editingselectionend: 0
+  };
+  return updateVisibleRows(newState);
+};
+
+const FocusDebugWatchInput = 1290;
+const FocusDebugRow = 1299;
+
+const addWatchExpression = async (state, expression) => {
+  const {
+    watchExpressions
+  } = state;
+  const watchExpression = {
+    expression,
+    value: null,
+    isEditing: true
+  };
+  const newWatchExpressions1 = [...watchExpressions, watchExpression];
+  const newState = {
+    ...state,
+    watchExpressions: newWatchExpressions1,
+    focus: FocusDebugWatchInput,
+    editingselectionstart: 0,
+    editingselectionend: expression.length
+  };
+  return updateVisibleRows(newState);
+};
+
+const getNewWatchExpressionsCancel = watchExpressions => {
+  const lastExpression = watchExpressions[watchExpressions.length - 1];
+  if (lastExpression && lastExpression.expression === '') {
+    return watchExpressions.toSpliced(-1, 1);
+  }
+  return watchExpressions;
+};
+
+const cancelWatchExpressionEdit = state => {
+  const {
+    watchExpressions
+  } = state;
+  const newWatchExpressions = getNewWatchExpressionsCancel(watchExpressions);
+  return {
+    ...state,
+    watchExpressions: newWatchExpressions,
+    focus: 0,
+    editingselectionstart: 0,
+    editingselectionend: 0
+  };
+};
+
+const None$3 = 'none';
+const Exception = 'exception';
+const Other = 'other';
+
+const None$2 = 'none';
+
+const create = (id, uri, x, y, width, height) => {
+  const state = {
+    id,
+    disposed: false,
+    processes: [],
+    debugState: None$6,
+    watchExpanded: false,
+    breakPointsExpanded: false,
+    scopeExpanded: false,
+    callStackExpanded: false,
+    watchVisible: true,
+    breakPointsVisible: true,
+    scopeVisible: true,
+    callStackVisible: true,
+    scopeChain: [],
+    callStack: [],
+    parsedScripts: Object.create(null),
+    pausedReason: None$3,
+    pausedMessage: '',
+    debugInputValue: '',
+    debugOutputValue: '',
+    callFrameId: '',
+    expandedIds: [],
+    scopeFocusedIndex: -1,
+    focusedIndex: -1,
+    pauseOnExceptionState: None$2,
+    cache: Object.create(null),
+    // TODO maybe store cache in extension host worker
+    exceptionBreakPoints: None$5,
+    watchExpressions: [],
+    focus: 0,
+    editingValue: '',
+    debugId: 0,
+    inputSource: 0,
+    editingselectionstart: 0,
+    editingselectionend: 0,
+    openFilesOnPause: true,
+    maxDescriptionLength: 100,
+    selectedIndex: -1,
+    visibleRows: []
+  };
+  set(id, state, state);
+};
+
+const deleteAllWatchExpressions = state => {
+  return {
+    ...state,
+    watchExpressions: []
+  };
+};
+
+const deleteWatchExpression = (state, index) => {
+  const {
+    watchExpressions
+  } = state;
+  if (index < 0 || index >= watchExpressions.length) {
+    return state;
+  }
+  const newState = {
+    ...state,
+    watchExpressions: watchExpressions.toSpliced(index, 1)
+  };
+  return updateVisibleRows(newState);
+};
+
+const isEqual$5 = (oldState, newState) => {
+  return oldState.focus === newState.focus;
+};
+
+const isEqual$4 = (oldState, newState) => {
+  if (!newState.focus) {
+    return true;
+  }
+  return oldState.focus === newState.focus;
+};
+
+const RenderItems = 1;
+const RenderFocus = 2;
+const RenderValue = 3;
+const RenderFocusContext = 7;
+const RenderSelection = 8;
+const RenderPauseOnExceptions = 9;
+
+const diffType$1 = RenderItems;
+const isEqual$3 = (oldState, newState) => {
+  return oldState.breakPointsExpanded === newState.breakPointsExpanded && oldState.callFrameId === newState.callFrameId && oldState.callStackExpanded === newState.callStackExpanded && oldState.debugState === newState.debugState && oldState.scopeChain === newState.scopeChain && oldState.scopeExpanded === newState.scopeExpanded && oldState.selectedIndex === newState.selectedIndex && oldState.visibleRows === newState.visibleRows && oldState.watchExpanded === newState.watchExpanded && oldState.watchExpressions === newState.watchExpressions;
+};
+
+const diffType = RenderPauseOnExceptions;
+const isEqual$2 = (oldState, newState) => {
+  return oldState.exceptionBreakPoints === newState.exceptionBreakPoints;
+};
+
+const isEqual$1 = (oldState, newState) => {
+  return oldState.editingselectionstart === newState.editingselectionstart && oldState.editingselectionend === newState.editingselectionend;
+};
+
+const Script$1 = 2;
+
+const isEqual = (oldState, newState) => {
+  if (newState.inputSource === Script$1) {
+    return newState.editingValue.length === 0;
+  }
+  return true;
+};
+
+const modules = [isEqual$3, isEqual$4, isEqual, isEqual$5, isEqual$1, isEqual$2];
+const numbers = [diffType$1, RenderFocusContext, RenderValue, RenderFocus, RenderSelection, diffType];
+
+const diff = (oldState, newState) => {
+  const diffResult = [];
+  for (let i = 0; i < modules.length; i++) {
+    const fn = modules[i];
+    if (!fn(oldState, newState)) {
+      diffResult.push(numbers[i]);
+    }
+  }
+  return diffResult;
+};
+
+const diff2 = uid => {
+  const {
+    oldState,
+    newState
+  } = get(uid);
+  const diffResult = diff(oldState, newState);
+  return diffResult;
+};
+
+const dispose = async uid => {
+  dispose$1(uid);
+};
+
+const commandIds = ['acceptWatchExpressionEdit', 'addWatchExpression', 'cancelWatchExpressionEdit', 'create', 'deleteAllWatchExpressions', 'deleteWatchExpression', 'diff2', 'dispose', 'focusNext', 'focusPrevious', 'getCommandIds', 'getKeyBindings', 'handleArrowDown', 'handleArrowLeft', 'handleArrowRight', 'handleArrowUp', 'handleChange', 'handleClickCallStackItem', 'handleClickCheckBox', 'handleClickDebugButton', 'handleClickPauseOnExceptions', 'handleClickPauseOnUncaughtExceptions', 'handleClickScopeValue', 'handleClickSectionAction', 'handleClickSectionBreakPoints', 'handleClickSectionCallstack', 'handleClickSectionHeading', 'handleClickSectionScope', 'handleClickSectionWatch', 'handleClickWatchExpression', 'handleClickWatchExpressionDelete', 'handleDebugInput', 'handleDelete', 'handleEnter', 'handleRename', 'handleEvaluate', 'handleInputBlur', 'handleInputFieldChange', 'handlePaused', 'handleResumed', 'handleScriptParsed', 'handleSectionHeaderContextMenu', 'handleSpace', 'handleWatchExpressionContextMenu', 'handleWatchExpressionDoubleClick', 'handleWatchValueChange', 'hideCallStack', 'hideScope', 'hideWatch', 'loadContent', 'loadContentLater', 'pause', 'refresh', 'refreshWatchExpression', 'removeWatchExpression', 'render2', 'renderActions', 'renderEventListeners', 'resize', 'restoreState', 'resume', 'selectIndex', 'selectNextRow', 'selectPreviousRow', 'setPauseOnExceptions', 'showCallStack', 'showScope', 'showWatch', 'stepInto', 'stepOut', 'stepOver', 'terminate', 'togglePause'];
+
+const getCommandIds = () => {
+  return commandIds;
+};
+
+const emptyHighlight = {
+  uri: '',
+  rowIndex: 0,
+  columnIndex: 0
+};
+const getHighlight = uid => {
+  const state = get(uid);
+  if (!state) {
+    return emptyHighlight;
+  }
+  const {
+    newState
+  } = state;
+  const {
+    parsedScripts,
+    callStack
+  } = newState;
+  if (callStack.length === 0) {
+    return emptyHighlight;
+  }
+  const top = callStack[0];
+  const {
+    location
+  } = top;
+  const {
+    scriptId,
+    lineNumber,
+    columnNumber
+  } = location;
+  const script = parsedScripts[scriptId];
+  if (!script) {
+    return emptyHighlight;
+  }
+  return {
+    uri: script.url,
+    rowIndex: lineNumber,
+    columnIndex: columnNumber
   };
 };
-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 [];
-  }
+const Enter = 3;
+const Escape = 8;
+const Space$1 = 9;
+const End = 255;
+const Home = 12;
+const LeftArrow = 13;
+const UpArrow = 14;
+const RightArrow = 15;
+const DownArrow = 16;
+const Delete = 18;
+const KeyC = 31;
+const KeyV = 50;
+const F2 = 58;
+const Backslash = 91;
+const Star = 131;
+
+const CtrlCmd = 1 << 11 >>> 0;
+const Alt = 1 << 9 >>> 0;
+
+const getKeyBindings = () => {
   return [{
-    id: AddWatchExpression,
-    title: 'Add new watch expression',
-    icon: '+'
+    key: Backslash | CtrlCmd,
+    command: 'Run And Debug.togglePause'
   }, {
-    id: RefreshWatchExpressions,
-    title: 'Refresh watch expressions',
-    icon: '↻'
+    key: LeftArrow,
+    command: 'Run And Debug.handleArrowLeft',
+    when: FocusDebugRow
+  }, {
+    key: RightArrow,
+    command: 'Run And Debug.handleArrowRight',
+    when: FocusDebugRow
+  }, {
+    key: Home,
+    command: 'Run And Debug.focusFirst',
+    when: FocusDebugRow
+  }, {
+    key: End,
+    command: 'Run And Debug.focusLast',
+    when: FocusDebugRow
+  }, {
+    key: UpArrow,
+    command: 'Run And Debug.selectPreviousRow',
+    when: FocusDebugRow
+  }, {
+    key: DownArrow,
+    command: 'Run And Debug.selectNextRow',
+    when: FocusDebugRow
+  }, {
+    key: CtrlCmd | Star,
+    command: 'Run And Debug.expandAll',
+    when: FocusDebugRow
+  }, {
+    key: Alt | RightArrow,
+    command: 'Run And Debug.expandRecursively',
+    when: FocusDebugRow
+  }, {
+    key: CtrlCmd | LeftArrow,
+    command: 'Run And Debug.collapseAll',
+    when: FocusDebugRow
+  }, {
+    key: CtrlCmd | KeyV,
+    command: 'Run And Debug.handlePaste',
+    when: FocusDebugRow
+  }, {
+    key: CtrlCmd | KeyC,
+    command: 'Run And Debug.handleCopy',
+    when: FocusDebugRow
+  }, {
+    key: F2,
+    command: 'Run And Debug.handleRename',
+    when: FocusDebugRow
+  }, {
+    key: Delete,
+    command: 'Run And Debug.handleDelete',
+    when: FocusDebugRow
+  }, {
+    key: Escape,
+    command: 'Run And Debug.focusNone',
+    when: FocusDebugRow
+  }, {
+    key: Enter,
+    command: 'Run And Debug.handleClickCurrent',
+    when: FocusDebugRow
+  }, {
+    key: Space$1,
+    command: 'Run And Debug.handleSpace',
+    when: FocusDebugRow
+  }, {
+    key: Enter,
+    command: 'Run And Debug.handleEnter',
+    when: FocusDebugRow
+  }, {
+    key: Escape,
+    command: 'Run And Debug.cancelWatchExpressionEdit',
+    when: FocusDebugWatchInput
+  }, {
+    key: Enter,
+    command: 'Run And Debug.acceptWatchExpressionEdit',
+    when: FocusDebugWatchInput
   }];
 };
 
-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 None$1 = 0;
+
+const getMenuEntriesWatchExpression = () => {
+  const addMenuEntry = {
+    id: 'addWatchExpression',
+    label: addWatchExpression$1(),
+    flags: None$1,
+    command: 'RunAndDebug.addWatchExpression'
+  };
+  const deleteMenuEntry = {
+    id: 'deleteWatchExpression',
+    label: deleteWatchExpression$1(),
+    flags: None$1,
+    command: 'RunAndDebug.deleteWatchExpression'
+  };
+  const deleteAllMenuEntry = {
+    id: 'deleteAllWatchExpressions',
+    label: deleteAllWatchExpressions$1(),
+    flags: None$1,
+    command: 'RunAndDebug.deleteAllWatchExpressions'
+  };
+  return [addMenuEntry, deleteMenuEntry, deleteAllMenuEntry];
 };
 
-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 DebugWatchExpression = 21_900;
+const DebugWatchSectionHeading = 21_901;
+
+const getMenuEntries = () => {
+  return [{
+    id: DebugWatchExpression,
+    entries: getMenuEntriesWatchExpression()
+  }];
 };
 
 const getSectionIndex = (state, name) => {
@@ -2440,14 +2452,6 @@ const getSectionIndex = (state, name) => {
   return rows.findIndex(row => row.type === SectionHeading && row.name === name);
 };
 
-const updateVisibleRows = state => {
-  const visibleRows = getRunAndDebugVisibleRows(state);
-  return {
-    ...state,
-    visibleRows
-  };
-};
-
 const handleClickSectionBreakPoints = state => {
   const {
     breakPointsExpanded
@@ -2520,106 +2524,58 @@ const getSectionClickHandler = id => {
   }
 };
 
-const handleArrowLeft = async state => {
-  const {
-    selectedIndex
-  } = state;
-  const rows = getRunAndDebugVisibleRows(state);
-  const row = rows[selectedIndex];
-  if (row && row.type === SectionHeading && row.expanded) {
-    const clickHandler = getSectionClickHandler(row.key);
-    return clickHandler(state);
-  }
-  return state;
-};
-
-const handleArrowRight = async state => {
-  const {
-    selectedIndex
-  } = state;
-  const rows = getRunAndDebugVisibleRows(state);
-  const row = rows[selectedIndex];
-  if (row && row.type === SectionHeading && !row.expanded) {
-    const clickHandler = getSectionClickHandler(row.key);
-    return clickHandler(state);
-  }
-  return state;
-};
-
-const createScriptMap = scripts => {
-  const parsedScripts = Object.create(null);
-  for (const script of scripts) {
-    parsedScripts[script.scriptId] = script;
-  }
-  return parsedScripts;
-};
-
-const getCallStack = callFrames => {
-  array(callFrames);
-  const callStack = [];
-  for (const callFrame of callFrames) {
-    callStack.push({
-      functionName: callFrame.functionName || '(anonymous)',
-      functionLocation: callFrame.functionLocation,
-      location: callFrame.location
-    });
+const removeElement = (array, element) => {
+  const index = array.indexOf(element);
+  if (index === -1) {
+    return array;
   }
-  return callStack;
+  return [...array.slice(0, index), ...array.slice(index + 1)];
 };
 
-const getDebugPausedMessage = reason => {
-  switch (reason) {
-    case Other:
-      return debuggerPaused();
-    case Exception$2:
-      return debuggerPausedOnException();
-    default:
-      return `Debugger paused (${reason})`;
+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 NewLine = '\n';
-const Space = ' ';
-
-const Local = 'local';
-const Closure = 'closure';
-const Global = 'global';
-const Catch = 'catch';
-const Eval = 'eval';
-const Block = 'block';
-const Script = 'script';
-const With = 'with';
-const Module = 'module';
-const WasmExpressionStack = 'wasm-expression-stack';
+// 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 getScopeLabel = element => {
-  switch (element.type) {
-    case Local:
-      return local();
-    case Closure:
-      if (element.name) {
-        return namedClosure(element.name);
-      }
-      return closure();
-    case Global:
-      return global();
-    case Block:
-      return block();
-    case WasmExpressionStack:
-      return expression();
-    case Module:
-      return module2();
-    case Eval:
-      return evalScope();
-    case Script:
-      return script();
-    case With:
-      return withScope();
-    case Catch:
-      return catchScope();
-    default:
-      return element.type;
-  }
+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,
+    focus: FocusDebugRow
+  };
+  return updateVisibleRows(newState);
 };
 
 const Boolean$1 = 'boolean';
@@ -2689,51 +2645,240 @@ const getDebugPropertyValueLabelObject = property => {
   return property.description;
 };
 
-const getDebugPropertyValueLabelString$1 = property => {
-  return `"${property.value}"`;
+const getDebugPropertyValueLabelString$1 = property => {
+  return `"${property.value}"`;
+};
+
+const getDebugPropertyValueLabelString = property => {
+  return 'undefined';
+};
+
+const getDebugPropertyValueLabel = (property, maxDescriptionLength) => {
+  if (!property) {
+    return 'n/a';
+  }
+  switch (property.type) {
+    case Number$1:
+    case Symbol:
+    case Function:
+      return getDebugPropertyValueLabelCommon(property, maxDescriptionLength);
+    case Object$1:
+      return getDebugPropertyValueLabelObject(property);
+    case Undefined:
+      return getDebugPropertyValueLabelString();
+    case String$1:
+      return getDebugPropertyValueLabelString$1(property);
+    case Boolean$1:
+      return getDebugPropertyValueLabelBoolean(property);
+    default:
+      return `${JSON.stringify(property)}`;
+  }
+};
+
+const getDebugValueObjectId = child => {
+  return child.object?.objectId || child.value?.objectId || '';
+};
+
+const getDebugValueType = child => {
+  if (!child) {
+    return None;
+  }
+  if (child.value && child.value.type) {
+    return child.value.type;
+  }
+  if (child.get) {
+    return Getter;
+  }
+  return None;
+};
+
+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,
+      key: child.name,
+      value: valueLabel,
+      valueType: getDebugValueType(child),
+      objectId: getDebugValueObjectId(child),
+      indent: indent + 10,
+      label: ''
+    });
+  }
+  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,
+    focus: FocusDebugRow
+  };
+  return updateVisibleRows(newState);
+};
+
+const LeftClick = 0;
+
+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, button) => {
+  // Return state unchanged if not left click
+  if (button !== LeftClick) {
+    return state;
+  }
+  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);
+};
+
+const handleArrowLeft = async state => {
+  const {
+    selectedIndex
+  } = state;
+  const rows = getRunAndDebugVisibleRows(state);
+  const row = rows[selectedIndex];
+  if (row && row.type === SectionHeading && row.expanded) {
+    const clickHandler = getSectionClickHandler(row.key);
+    return clickHandler(state);
+  }
+  if (row && row.type === Scope$4 && row.expanded) {
+    return await handleClickScopeValue(state, row.key, LeftClick);
+  }
+  return state;
+};
+
+const handleArrowRight = async state => {
+  const {
+    selectedIndex
+  } = state;
+  const rows = getRunAndDebugVisibleRows(state);
+  const row = rows[selectedIndex];
+  if (row && row.type === SectionHeading && !row.expanded) {
+    const clickHandler = getSectionClickHandler(row.key);
+    return clickHandler(state);
+  }
+  if (row && row.type === Scope$4 && !row.expanded) {
+    return await handleClickScopeValue(state, row.key, LeftClick);
+  }
+  return state;
+};
+
+const createScriptMap = scripts => {
+  const parsedScripts = Object.create(null);
+  for (const script of scripts) {
+    parsedScripts[script.scriptId] = script;
+  }
+  return parsedScripts;
 };
 
-const getDebugPropertyValueLabelString = property => {
-  return 'undefined';
+const getCallStack = callFrames => {
+  array(callFrames);
+  const callStack = [];
+  for (const callFrame of callFrames) {
+    callStack.push({
+      functionName: callFrame.functionName || '(anonymous)',
+      functionLocation: callFrame.functionLocation,
+      location: callFrame.location
+    });
+  }
+  return callStack;
 };
 
-const getDebugPropertyValueLabel = (property, maxDescriptionLength) => {
-  if (!property) {
-    return 'n/a';
-  }
-  switch (property.type) {
-    case Number$1:
-    case Symbol:
-    case Function:
-      return getDebugPropertyValueLabelCommon(property, maxDescriptionLength);
-    case Object$1:
-      return getDebugPropertyValueLabelObject(property);
-    case Undefined:
-      return getDebugPropertyValueLabelString();
-    case String$1:
-      return getDebugPropertyValueLabelString$1(property);
-    case Boolean$1:
-      return getDebugPropertyValueLabelBoolean(property);
+const getDebugPausedMessage = reason => {
+  switch (reason) {
+    case Other:
+      return debuggerPaused();
+    case Exception:
+      return debuggerPausedOnException();
     default:
-      return `${JSON.stringify(property)}`;
+      return `Debugger paused (${reason})`;
   }
 };
 
-const getDebugValueObjectId = child => {
-  return child.object?.objectId || child.value?.objectId || '';
-};
+const NewLine = '\n';
+const Space = ' ';
 
-const getDebugValueType = child => {
-  if (!child) {
-    return None;
-  }
-  if (child.value && child.value.type) {
-    return child.value.type;
-  }
-  if (child.get) {
-    return Getter;
+const Local = 'local';
+const Closure = 'closure';
+const Global = 'global';
+const Catch = 'catch';
+const Eval = 'eval';
+const Block = 'block';
+const Script = 'script';
+const With = 'with';
+const Module = 'module';
+const WasmExpressionStack = 'wasm-expression-stack';
+
+const getScopeLabel = element => {
+  switch (element.type) {
+    case Local:
+      return local();
+    case Closure:
+      if (element.name) {
+        return namedClosure(element.name);
+      }
+      return closure();
+    case Global:
+      return global();
+    case Block:
+      return block();
+    case WasmExpressionStack:
+      return expression();
+    case Module:
+      return module2();
+    case Eval:
+      return evalScope();
+    case Script:
+      return script();
+    case With:
+      return withScope();
+    case Catch:
+      return catchScope();
+    default:
+      return element.type;
   }
-  return None;
 };
 
 const getDescriptionValueLabel = params => {
@@ -2757,10 +2902,10 @@ const getScopeChain = (params, thisObject, scopeChain, knownProperties, descript
     });
     // if(params.reason)
     if (scope.type === Local) {
-      if (params.reason === Exception$2) {
+      if (params.reason === Exception) {
         const value = getDescriptionValueLabel(params);
         elements.push({
-          type: Exception,
+          type: Exception$1,
           key: 'Exception',
           value,
           valueType: '',
@@ -2873,7 +3018,7 @@ const handleResumed = state => {
     scopeChain: [],
     callStack: [],
     pausedMessage: '',
-    pausedReason: None$5,
+    pausedReason: None$3,
     callFrameId: ''
   };
   return updateVisibleRows(newState);
@@ -2973,12 +3118,12 @@ const handleClickPauseOnExceptions = async state => {
     exceptionBreakPoints
   } = state;
   switch (exceptionBreakPoints) {
-    case None$4:
+    case None$5:
       return setPauseOnExceptions(state, All);
     case Uncaught:
       return setPauseOnExceptions(state, All);
     case All:
-      return setPauseOnExceptions(state, None$4);
+      return setPauseOnExceptions(state, None$5);
     default:
       return state;
   }
@@ -2986,12 +3131,12 @@ const handleClickPauseOnExceptions = async state => {
 
 const getNewExceptionState = exceptionState => {
   switch (exceptionState) {
-    case None$4:
+    case None$5:
       return Uncaught;
     case Uncaught:
-      return None$4;
+      return None$5;
     case All:
-      return None$4;
+      return None$5;
     default:
       return exceptionState;
   }
@@ -3020,134 +3165,6 @@ const handleClickCheckBox = (state, 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,
-    focus: FocusDebugRow
-  };
-  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,
-      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,
-    focus: FocusDebugRow
-  };
-  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
  */
@@ -3217,6 +3234,7 @@ const handleEvaluate = async state => {
     debugId
   } = state;
   const result = await evaluate(debugId, debugInputValue, callFrameId);
+  // @ts-ignore
   const actualResult = result.result.result.value;
   return {
     ...state,
@@ -3297,7 +3315,7 @@ const handleClickSectionAction = async (state, actionId) => {
     return state;
   }
   if (actionId === AddWatchExpression) {
-    return addWatchExpression$1(state, '');
+    return addWatchExpression(state, '');
   }
   if (actionId === RefreshWatchExpressions) {
     return refreshWatchExpression(state);
@@ -3305,8 +3323,6 @@ const handleClickSectionAction = async (state, actionId) => {
   return state;
 };
 
-const LeftClick = 0;
-
 const handleClickSectionHeading = async (state, id, button) => {
   if (button !== LeftClick) {
     return state;
@@ -3328,15 +3344,16 @@ const editWatchExpression = (state, index) => {
     isEditing: true
   };
   const newWatchExpressions = watchExpressions.toSpliced(index, 1, newItem);
-  return {
+  const newState = {
     ...state,
     watchExpressions: newWatchExpressions,
     focus: FocusDebugWatchInput,
-    inputSource: Script$2,
+    inputSource: Script$1,
     editingValue: item.expression,
     editingselectionstart: 0,
     editingselectionend: item.expression.length
   };
+  return updateVisibleRows(newState);
 };
 
 const handleClickWatchExpression = async (state, dataIndex, defaultPrevented) => {
@@ -3349,13 +3366,29 @@ const handleClickWatchExpression = async (state, dataIndex, defaultPrevented) =>
 
 const handleClickWatchExpressionDelete = async (state, dataIndex) => {
   const index = parseIndex(dataIndex);
-  return deleteWatchExpression$1(state, index);
+  return deleteWatchExpression(state, index);
 };
 
 const handleWatchExpressionDoubleClick = async (state, dataIndex) => {
   return state;
 };
 
+const handleDelete = async state => {
+  const {
+    selectedIndex,
+    visibleRows
+  } = state;
+  if (selectedIndex < 0 || selectedIndex >= visibleRows.length) {
+    return state;
+  }
+  const currentRow = visibleRows[selectedIndex];
+  if (currentRow.type !== WatchExpression || currentRow.index === undefined) {
+    return state;
+  }
+  const watchIndex = currentRow.index;
+  return deleteWatchExpression(state, watchIndex);
+};
+
 const handleEnter = async state => {
   return state;
 };
@@ -3385,6 +3418,22 @@ const handleInputFieldChange = (state, name, value) => {
   return state;
 };
 
+const handleRename = async state => {
+  const {
+    selectedIndex
+  } = state;
+  const rows = getRunAndDebugVisibleRows(state);
+  const row = rows[selectedIndex];
+  if (row && row.type === WatchExpression && row.index !== undefined) {
+    const watchIndex = row.index;
+    const watchExpression = state.watchExpressions[watchIndex];
+    if (watchExpression && !watchExpression.isEditing) {
+      return editWatchExpression(state, watchIndex);
+    }
+  }
+  return state;
+};
+
 const handleScriptParsed = (state, parsedScript) => {
   const {
     parsedScripts
@@ -3616,6 +3665,9 @@ const restoreState = savedState => {
 };
 
 const loadContent = async (state, isTest, savedState) => {
+  if (isTest) {
+    savedState = {};
+  }
   const {
     watchExpressions,
     watchExpanded,
@@ -4153,7 +4205,7 @@ const renderWatchExpression = (row, selectedIndex, rowIndex) => {
     childCount: 1
   }, text(value), {
     type: Button,
-    title: deleteWatchExpression(),
+    title: deleteWatchExpression$1(),
     className: mergeClassNames(IconButton, DebugSectionAction, DeleteWatchExpression),
     'data-index': index,
     onClick: HandleClickWatchExpressionDelete,
@@ -4199,13 +4251,13 @@ const getRowRenderer = type => {
       return renderMessage;
     case SectionHeading:
       return renderSectionHeading;
-    case CallStack$2:
+    case CallStack$3:
       return renderCallStack;
-    case Scope$3:
+    case Scope$4:
       return renderScope;
     case Value:
     case Property$1:
-    case Exception$1:
+    case Exception$2:
       return renderValue;
     case CheckBox$1:
       return renderCheckBox;
@@ -4464,7 +4516,7 @@ const renderEventListeners = () => {
     preventDefault: true
   }, {
     name: HandleClickScopeValue,
-    params: ['handleClickScopeValue', 'event.target.dataset.name']
+    params: ['handleClickScopeValue', 'event.target.dataset.name', 'event.button']
   }, {
     name: HandleInputFieldChange,
     params: ['handleInputFieldChange', 'event.target.name', 'event.target.value']
@@ -4583,11 +4635,11 @@ const commandMap = {
   'Debug.scriptParsed': scriptParsed,
   'Initialize.initialize': initialize,
   'RunAndDebug.acceptWatchExpressionEdit': wrapCommand(acceptWatchExpressionEdit),
-  'RunAndDebug.addWatchExpression': wrapCommand(addWatchExpression$1),
+  'RunAndDebug.addWatchExpression': wrapCommand(addWatchExpression),
   'RunAndDebug.cancelWatchExpressionEdit': wrapCommand(cancelWatchExpressionEdit),
   'RunAndDebug.create': create,
-  'RunAndDebug.deleteWatchExpression': deleteWatchExpression$1,
-  'RunAndDebug.deleteAllWatchExpressions': deleteAllWatchExpressions$1,
+  'RunAndDebug.deleteWatchExpression': deleteWatchExpression,
+  'RunAndDebug.deleteAllWatchExpressions': deleteAllWatchExpressions,
   'RunAndDebug.diff2': diff2,
   'RunAndDebug.dispose': dispose,
   'RunAndDebug.focusNext': wrapCommand(focusNext),
@@ -4657,6 +4709,8 @@ const commandMap = {
   'RunAndDebug.showCallStack': wrapCommand(showCallStack),
   'RunAndDebug.hideCallStack': wrapCommand(hideCallStack),
   'RunAndDebug.handleEnter': wrapCommand(handleEnter),
+  'RunAndDebug.handleRename': wrapCommand(handleRename),
+  'RunAndDebug.handleDelete': wrapCommand(handleDelete),
   'RunAndDebug.handleSpace': wrapCommand(handleSpace)
 };