@lvce-editor/static-server 0.53.1 → 0.53.2

package/static/{bd5d499 → 03f3661}/packages/debug-worker/dist/debugWorkerMain.js

@@ -513,7 +513,7 @@ const create$4$1 = (method, params) => {
   };
 };
 const callbacks = Object.create(null);
-const set$5 = (id, fn) => {
+const set$4 = (id, fn) => {
   callbacks[id] = fn;
 };
 const get$2 = id => {
@@ -532,7 +532,7 @@ const registerPromise = () => {
     resolve,
     promise
   } = Promise.withResolvers();
-  set$5(id, resolve);
+  set$4(id, resolve);
   return {
     id,
     promise
@@ -994,207 +994,31 @@ const WebWorkerRpcClient = {
   create: create$4
 };
 
-const getNewWatchExpressionsAccept = (watchExpressions, editingValue) => {
-  const editingIndex = watchExpressions.findIndex(expr => expr.isEditing);
-  if (editingIndex === -1) {
-    return watchExpressions;
-  }
-  if (editingValue === '') {
-    return watchExpressions.toSpliced(editingIndex, 1);
-  }
-  const newExpression = {
-    expression: editingValue,
-    value: null,
-    isEditing: false
-  };
-  return watchExpressions.toSpliced(editingIndex, 1, newExpression);
-};
-
-const acceptWatchExpressionEdit = state => {
-  const {
-    watchExpressions,
-    editingValue
-  } = state;
-  const newWatchExpressions = getNewWatchExpressionsAccept(watchExpressions, editingValue);
-  return {
-    ...state,
-    watchExpressions: newWatchExpressions,
-    focus: 0
-  };
-};
-
-const FocusDebugScope = 30;
-const FocusDebugWatchInput = 1290;
-
-const addWatchExpression = (state, expression) => {
-  const {
-    watchExpressions
-  } = state;
-  const watchExpression = {
-    expression,
-    value: null,
-    isEditing: true
-  };
-  return {
-    ...state,
-    watchExpressions: [...watchExpressions, watchExpression],
-    focus: FocusDebugWatchInput
-  };
-};
-
-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
-  };
-};
-
-const None$5 = 'none';
-const Exception$2 = 'exception';
-const Other = 'other';
-
-const None$4 = 0;
+const None$5 = 0;
 const Paused = 1;
 const Default = 2;
 
-const All = 1;
-const Uncaught = 2;
-const None$3 = 0;
-
-const None$2 = 'none';
-
-const create$2 = () => {
-  const states = Object.create(null);
-  return {
-    get(uid) {
-      return states[uid];
-    },
-    set(uid, oldState, newState) {
-      states[uid] = {
-        oldState,
-        newState
-      };
-    },
-    dispose(uid) {
-      delete states[uid];
-    },
-    getKeys() {
-      return Object.keys(states).map(key => {
-        return Number.parseInt(key);
-      });
-    },
-    clear() {
-      for (const key of Object.keys(states)) {
-        delete states[key];
-      }
-    },
-    wrapCommand(fn) {
-      const wrapped = async (uid, ...args) => {
-        const {
-          newState
-        } = states[uid];
-        const newerState = await fn(newState, ...args);
-        if (newState === newerState) {
-          return;
-        }
-        const latest = states[uid];
-        states[uid] = {
-          oldState: latest.oldState,
-          newState: newerState
-        };
-      };
-      return wrapped;
-    },
-    diff(uid, modules, numbers) {
-      const {
-        oldState,
-        newState
-      } = states[uid];
-      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 {
-  get: get$1,
-  set: set$4,
-  wrapCommand,
-  dispose: dispose$1,
-  getKeys
-} = create$2();
-
-const create$1 = (id, uri, x, y, width, height) => {
-  const state = {
-    id,
-    disposed: false,
-    processes: [],
-    debugState: None$4,
-    watchExpanded: false,
-    breakPointsExpanded: false,
-    scopeExpanded: false,
-    callStackExpanded: false,
-    scopeChain: [],
-    callStack: [],
-    parsedScripts: Object.create(null),
-    pausedReason: None$5,
-    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$3,
-    watchExpressions: [],
-    focus: 0,
-    editingValue: ''
-  };
-  set$4(id, state, state);
-};
-
 const rpcs = Object.create(null);
 const set$d = (id, rpc) => {
   rpcs[id] = rpc;
 };
-const get = id => {
+const get$1 = id => {
   return rpcs[id];
 };
 
 /* eslint-disable  @typescript-eslint/explicit-function-return-type */
 
-const create = rpcId => {
+const create$2 = rpcId => {
   return {
     // @ts-ignore
     invoke(method, ...params) {
-      const rpc = get(rpcId);
+      const rpc = get$1(rpcId);
       // @ts-ignore
       return rpc.invoke(method, ...params);
     },
     // @ts-ignore
     invokeAndTransfer(method, ...params) {
-      const rpc = get(rpcId);
+      const rpc = get$1(rpcId);
       // @ts-ignore
       return rpc.invokeAndTransfer(method, ...params);
     },
@@ -1202,7 +1026,7 @@ const create = rpcId => {
       set$d(rpcId, rpc);
     },
     async dispose() {
-      const rpc = get(rpcId);
+      const rpc = get$1(rpcId);
       await rpc.dispose();
     }
   };
@@ -1217,7 +1041,7 @@ const RpcId = {
 const {
   invoke: invoke$b,
   set: set$b
-} = create(EditorWorker$1);
+} = create$2(EditorWorker$1);
 const EditorWorker = {
   __proto__: null,
   invoke: invoke$b,
@@ -1226,7 +1050,7 @@ const EditorWorker = {
 const {
   invoke: invoke$8,
   set: set$8
-} = create(ExtensionHostWorker);
+} = create$2(ExtensionHostWorker);
 const ExtensionHost = {
   __proto__: null,
   invoke: invoke$8,
@@ -1235,19 +1059,19 @@ const ExtensionHost = {
 const {
   invoke: invoke$3,
   invokeAndTransfer: invokeAndTransfer$3,
-  set: set$3
-} = create(RendererWorker$1);
+  set: set$3$1
+} = create$2(RendererWorker$1);
 const RendererWorker = {
   __proto__: null,
   invoke: invoke$3,
   invokeAndTransfer: invokeAndTransfer$3,
-  set: set$3
+  set: set$3$1
 };
 
 const {
   invoke: invoke$2,
   invokeAndTransfer,
-  set: set$2
+  set: set$3
 } = RendererWorker;
 
 const activateByEvent = event => {
@@ -1256,7 +1080,7 @@ const activateByEvent = event => {
 
 const {
   invoke: invoke$1,
-  set: set$1
+  set: set$2
 } = ExtensionHost;
 
 const executeProvider = async ({
@@ -1364,7 +1188,7 @@ const getScripts = debugId => {
 
 const {
   invoke,
-  set
+  set: set$1
 } = EditorWorker;
 
 const getDebugUri = (key, scriptId) => {
@@ -1382,16 +1206,83 @@ const openUri = async (uri, languageId, rowIndex, columnIndex) => {
   await invoke$2('Main.openUri', uri, focus, options);
 };
 
+const create$1 = () => {
+  const states = Object.create(null);
+  return {
+    get(uid) {
+      return states[uid];
+    },
+    set(uid, oldState, newState) {
+      states[uid] = {
+        oldState,
+        newState
+      };
+    },
+    dispose(uid) {
+      delete states[uid];
+    },
+    getKeys() {
+      return Object.keys(states).map(key => {
+        return Number.parseInt(key);
+      });
+    },
+    clear() {
+      for (const key of Object.keys(states)) {
+        delete states[key];
+      }
+    },
+    wrapCommand(fn) {
+      const wrapped = async (uid, ...args) => {
+        const {
+          newState
+        } = states[uid];
+        const newerState = await fn(newState, ...args);
+        if (newState === newerState) {
+          return;
+        }
+        const latest = states[uid];
+        states[uid] = {
+          oldState: latest.oldState,
+          newState: newerState
+        };
+      };
+      return wrapped;
+    },
+    diff(uid, modules, numbers) {
+      const {
+        oldState,
+        newState
+      } = states[uid];
+      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 {
+  get,
+  set,
+  wrapCommand,
+  dispose: dispose$1,
+  getKeys
+} = create$1();
+
 const getKey = () => {
   const keys = getKeys();
-  return keys[0];
+  return keys.at(-1) || 0;
 };
 const openAtPausedLocation = async () => {
   const key = getKey();
   // TODO ask renderer worker to open file
   const {
     newState
-  } = get$1(key);
+  } = get(key);
   const {
     callStack
   } = newState;
@@ -1468,11 +1359,179 @@ const handleChange$1 = async params => {
   await invoke$2('Run And Debug.handleChange', params);
 };
 
-const isEqual$2 = (oldState, newState) => {
+const evaluateWatchExpression = async (debugId, callFrameId, expression) => {
+  const result = await evaluate(debugId, expression, callFrameId);
+  return result;
+};
+
+const evaluateWatchExpressions = async (debugId, callFrameId, watchExpressions) => {
+  const results = await Promise.all(watchExpressions.map(async expression => {
+    try {
+      const result = await evaluateWatchExpression(debugId, callFrameId, expression.expression);
+      const resultString = result.description;
+      return {
+        ...expression,
+        value: resultString
+      };
+    } catch (error) {
+      console.error(`Failed to evaluate expression: ${error}`);
+      return {
+        ...expression
+      };
+    }
+  }));
+  return results;
+};
+
+const getNewWatchExpressions = async (debugId, callFrameId, debugState, watchExpressions) => {
+  if (debugState === Paused) {
+    const newWatchExpressions = await evaluateWatchExpressions(debugId, callFrameId, watchExpressions);
+    return newWatchExpressions;
+  }
+  return watchExpressions;
+};
+const getNewWatchExpressionsAccept = async (debugId, callFrameId, debugState, watchExpressions, editingValue) => {
+  const editingIndex = watchExpressions.findIndex(expr => expr.isEditing);
+  if (editingIndex === -1) {
+    return watchExpressions;
+  }
+  if (editingValue === '') {
+    return watchExpressions.toSpliced(editingIndex, 1);
+  }
+  const newExpression = {
+    expression: editingValue,
+    value: null,
+    isEditing: false
+  };
+  const newWatchExpressions1 = watchExpressions.toSpliced(editingIndex, 1, newExpression);
+  const newWatchExpressions2 = await getNewWatchExpressions(debugId, callFrameId, debugState, newWatchExpressions1);
+  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 FocusDebugScope = 30;
+const FocusDebugWatchInput = 1290;
+
+const addWatchExpression = 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 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$4 = 'none';
+const Exception$2 = 'exception';
+const Other = 'other';
+
+const All = 1;
+const Uncaught = 2;
+const None$3 = 0;
+
+const None$2 = 'none';
+
+const create = (id, uri, x, y, width, height) => {
+  const state = {
+    id,
+    disposed: false,
+    processes: [],
+    debugState: None$5,
+    watchExpanded: false,
+    breakPointsExpanded: false,
+    scopeExpanded: false,
+    callStackExpanded: false,
+    scopeChain: [],
+    callStack: [],
+    parsedScripts: Object.create(null),
+    pausedReason: None$4,
+    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$3,
+    watchExpressions: [],
+    focus: 0,
+    editingValue: '',
+    debugId: 0,
+    inputSource: 0,
+    editingselectionstart: 0,
+    editingselectionend: 0
+  };
+  set(id, state, state);
+};
+
+const deleteWatchExpression$1 = (state, index) => {
+  if (index < 0 || index >= state.watchExpressions.length) {
+    return state;
+  }
+  return {
+    ...state,
+    watchExpressions: state.watchExpressions.toSpliced(index, 1)
+  };
+};
+
+const isEqual$4 = (oldState, newState) => {
   return oldState.focus === newState.focus;
 };
 
-const isEqual$1 = (oldState, newState) => {
+const isEqual$3 = (oldState, newState) => {
   if (!newState.focus) {
     return true;
   }
@@ -1481,15 +1540,30 @@ const isEqual$1 = (oldState, newState) => {
 
 const RenderItems = 1;
 const RenderFocus = 2;
+const RenderValue = 3;
 const RenderFocusContext = 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;
+};
+
+const isEqual$1 = (oldState, newState) => {
+  return oldState.editingselectionstart === newState.editingselectionstart && oldState.editingselectionend === newState.editingselectionend;
+};
+
+const Script$2 = 2;
+
 const isEqual = (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;
+  if (newState.inputSource === Script$2) {
+    return newState.editingValue.length === 0;
+  }
+  return true;
 };
 
-const modules = [isEqual, isEqual$1, isEqual$2];
-const numbers = [diffType, RenderFocusContext, RenderFocus];
+const modules = [isEqual$2, isEqual$3, isEqual, isEqual$4, isEqual$1];
+const numbers = [diffType, RenderFocusContext, RenderValue, RenderFocus, RenderSelection];
 
 const diff = (oldState, newState) => {
   const diffResult = [];
@@ -1506,7 +1580,7 @@ const diff2 = uid => {
   const {
     oldState,
     newState
-  } = get$1(uid);
+  } = get(uid);
   const diffResult = diff(oldState, newState);
   return diffResult;
 };
@@ -1515,7 +1589,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', 'handleDebugInput', 'handleEvaluate', 'handleInputFieldChange', 'handlePaused', 'handleResumed', 'handleScriptParsed', 'loadContent', 'loadContentLater', 'pause', 'refresh', 'removeWatchExpression', 'render2', 'renderActions', 'renderEventListeners', 'resize', 'resume', 'setPauseOnExceptions', 'stepInto', 'stepOut', 'stepOver', 'terminate', 'togglePause'];
+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', 'handleWatchValueChange', 'loadContent', 'loadContentLater', 'pause', 'refresh', 'removeWatchExpression', 'deleteWatchExpression', 'render2', 'renderActions', 'renderEventListeners', 'resize', 'restoreState', 'resume', 'setPauseOnExceptions', 'stepInto', 'stepOut', 'stepOver', 'terminate', 'togglePause'];
 
 const getCommandIds = () => {
   return commandIds;
@@ -1527,7 +1601,7 @@ const emptyHighlight = {
   columnIndex: 0
 };
 const getHighlight = uid => {
-  const state = get$1(uid);
+  const state = get(uid);
   if (!state) {
     return emptyHighlight;
   }
@@ -1720,6 +1794,7 @@ 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$1 = 'Delete watch expression';
 
 const local = () => {
   return i18nString(Local$1);
@@ -1807,6 +1882,9 @@ const pauseOnUncaughtExceptions = () => {
 const noWatchExpression = () => {
   return i18nString(NoWatchExpression);
 };
+const deleteWatchExpression = () => {
+  return i18nString(DeleteWatchExpression$1);
+};
 
 const getDebugPausedMessage = reason => {
   switch (reason) {
@@ -2078,14 +2156,15 @@ const handleResumed = state => {
     scopeChain: [],
     callStack: [],
     pausedMessage: '',
-    pausedReason: None$5,
+    pausedReason: None$4,
     callFrameId: ''
   };
 };
 
 const handlePaused$1 = async state => {
   const {
-    debugId
+    debugId,
+    watchExpressions
   } = state;
   try {
     const {
@@ -2097,6 +2176,8 @@ const handlePaused$1 = async state => {
       expandedIds,
       scriptMap
     } = await getPausedInfo2(debugId);
+    // TODO move this to getPausedInfo2
+    const newWatchExpressions = await evaluateWatchExpressions(debugId, callFrameId, watchExpressions);
     return {
       ...state,
       debugState: Paused,
@@ -2107,7 +2188,8 @@ const handlePaused$1 = async state => {
       pausedMessage,
       callFrameId,
       expandedIds,
-      parsedScripts: scriptMap
+      parsedScripts: scriptMap,
+      watchExpressions: newWatchExpressions
     };
   } catch {
     return state;
@@ -2161,8 +2243,13 @@ const getOpenInfo = (id, parsedScripts, item) => {
   };
 };
 
-const handleClickCallstackItem = async (state, dataIndex) => {
+const parseIndex = dataIndex => {
   const index = Number.parseInt(dataIndex);
+  return index;
+};
+
+const handleClickCallstackItem = async (state, dataIndex) => {
+  const index = parseIndex(dataIndex);
   const {
     callStack,
     parsedScripts,
@@ -2624,6 +2711,58 @@ const handleClickSectionHeading = async (state, id) => {
   return fn(state);
 };
 
+const editWatchExpression = (state, index) => {
+  const {
+    watchExpressions
+  } = state;
+  const item = watchExpressions[index];
+  if (!item) {
+    return state;
+  }
+  const newItem = {
+    ...item,
+    isEditing: true
+  };
+  const newWatchExpressions = watchExpressions.toSpliced(index, 1, newItem);
+  return {
+    ...state,
+    watchExpressions: newWatchExpressions,
+    focus: FocusDebugWatchInput,
+    inputSource: Script$2,
+    editingValue: item.expression,
+    editingselectionstart: 0,
+    editingselectionend: item.expression.length
+  };
+};
+
+const handleClickWatchExpression = async (state, dataIndex, defaultPrevented) => {
+  if (defaultPrevented) {
+    return state;
+  }
+  const index = parseIndex(dataIndex);
+  return editWatchExpression(state, index);
+};
+
+const handleClickWatchExpressionDelete = async (state, dataIndex) => {
+  const index = parseIndex(dataIndex);
+  return deleteWatchExpression$1(state, index);
+};
+
+const handleWatchExpressionDoubleClick = async (state, dataIndex) => {
+  return state;
+};
+
+const handleInputBlur = async state => {
+  const {
+    watchExpressions
+  } = state;
+  const editingIndex = watchExpressions.findIndex(expr => expr.isEditing);
+  if (editingIndex === -1) {
+    return state;
+  }
+  return acceptWatchExpressionEdit(state);
+};
+
 const handleWatchValueChange = (state, value) => {
   return {
     ...state,
@@ -2688,7 +2827,7 @@ const createEditorWorkerRpc = async () => {
 const initializeEditorWorker = async () => {
   try {
     const rpc = await createEditorWorkerRpc();
-    set(rpc);
+    set$1(rpc);
   } catch {
     // ignore
   }
@@ -2718,21 +2857,117 @@ const createExtensionHostRpc = async () => {
 
 const initializeExtensionHost = async () => {
   const rpc = await createExtensionHostRpc();
-  set$1(rpc);
+  set$2(rpc);
 };
 
 const initialize = async () => {
   await Promise.all([initializeExtensionHost(), initializeEditorWorker()]);
 };
 
-const loadContent = async (state, isTest) => {
+const getDebugId = isTest => {
   const debugId = isTest ? 'test-debug' : 'node-debug'; // TODO
+  return debugId;
+};
+
+const hasProperty = (object, key) => {
+  return Boolean(object && typeof object === 'object' && key in object);
+};
+
+const restoreBoolean = (savedState, key) => {
+  if (hasProperty(savedState, key) && typeof savedState[key] === 'boolean') {
+    return savedState[key];
+  }
+  return false;
+};
+
+const restoreBreakPointsExpanded = savedState => {
+  return restoreBoolean(savedState, 'breakPointsExpanded');
+};
+
+const restoreEditingValue = savedState => {
+  if (hasProperty(savedState, 'editingValue') && typeof savedState.editingValue === 'string') {
+    return savedState.editingValue;
+  }
+  return '';
+};
+
+const restoreFocus = savedState => {
+  // if (hasProperty(savedState, 'focus') && typeof savedState.focus === 'number') {
+  //   return savedState.focus
+  // }
+  return 0;
+};
+
+const restoreScopeExpanded = savedState => {
+  return restoreBoolean(savedState, 'scopeExpanded');
+};
+
+const restoreWatchExpanded = savedState => {
+  return restoreBoolean(savedState, 'watchExpanded');
+};
+
+const restoreWatchExpression = savedExpression => {
+  if (typeof savedExpression === 'object' && savedExpression !== null && hasProperty(savedExpression, 'expression') && typeof savedExpression.expression === 'string' && hasProperty(savedExpression, 'value') && hasProperty(savedExpression, 'isEditing') && typeof savedExpression.isEditing === 'boolean') {
+    const value = savedExpression.value;
+    if (value === null || value === undefined || typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean') {
+      return {
+        expression: savedExpression.expression,
+        value,
+        isEditing: savedExpression.isEditing
+      };
+    }
+  }
+  return {
+    expression: '',
+    value: null,
+    isEditing: false
+  };
+};
+const restoreWatchExpressions = savedState => {
+  if (hasProperty(savedState, 'watchExpressions') && Array.isArray(savedState.watchExpressions)) {
+    return savedState.watchExpressions.map(restoreWatchExpression);
+  }
+  return [];
+};
+
+const restoreState = savedState => {
+  const watchExpressions = restoreWatchExpressions(savedState);
+  const watchExpanded = restoreWatchExpanded(savedState);
+  const scopeExpanded = restoreScopeExpanded(savedState);
+  const breakPointsExpanded = restoreBreakPointsExpanded(savedState);
+  const focus = restoreFocus();
+  const editingValue = restoreEditingValue(savedState);
+  return {
+    watchExpressions,
+    watchExpanded,
+    scopeExpanded,
+    breakPointsExpanded,
+    focus,
+    editingValue
+  };
+};
+
+const loadContent = async (state, isTest, savedState) => {
+  const {
+    watchExpressions,
+    watchExpanded,
+    breakPointsExpanded,
+    scopeExpanded,
+    focus,
+    editingValue
+  } = restoreState(savedState);
+  const debugId = getDebugId(isTest);
   return {
     ...state,
     debugId,
     debugState: Default,
-    scopeExpanded: true,
-    callStackExpanded: true
+    scopeExpanded,
+    callStackExpanded: true,
+    breakPointsExpanded,
+    watchExpressions,
+    watchExpanded,
+    focus,
+    editingValue
   };
 };
 
@@ -2758,7 +2993,7 @@ const readFile = async uri => {
     key,
     scriptId
   } = parseUri(uri);
-  const instance = get$1(key);
+  const instance = get(key);
   if (!instance) {
     return '';
   }
@@ -2797,11 +3032,11 @@ const getFocusSelector = focusId => {
   }
 };
 
-const renderFocus = state => {
+const renderFocus = (oldState, newState) => {
   const {
     id,
     focus
-  } = state;
+  } = newState;
   const selector = getFocusSelector(focus);
   if (!selector) {
     return ['Viewlet.focusElementByName', id, ''];
@@ -2809,13 +3044,26 @@ const renderFocus = state => {
   return ['Viewlet.focusElementByName', id, selector];
 };
 
-const renderFocusContext = state => {
+const renderFocusContext = (oldState, newState) => {
   const {
     focus
-  } = state;
+  } = newState;
   return ['Viewlet.setFocusContext', focus];
 };
 
+const renderInputValue = (oldState, newState) => {
+  const {
+    id,
+    focus,
+    editingValue
+  } = 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';
@@ -2832,35 +3080,38 @@ const WatchMessage = 9;
 const WatchExpression = 10;
 const InputField = 11;
 
+const CallStackArrow = 'CallStackArrow';
+const CallStackDescription = 'CallStackDescription';
+const CallStackLabel = 'CallStackLabel';
 const Chevron = 'Chevron';
 const DebugButton = 'DebugButton';
 const DebugButtons = 'DebugButtons';
 const DebugPausedMessage = 'DebugPausedMessage';
 const DebugRow = 'DebugRow';
 const DebugRowCallStack = 'DebugRowCallStack';
-const CallStackDescription = 'CallStackDescription';
-const CallStackLabel = 'CallStackLabel';
-const CallStackArrow = 'CallStackArrow';
-const InputBox = 'InputBox';
 const DebugRowCheckBox = 'DebugRowCheckBox';
+const DebugRowInputField = 'DebugRowInputField';
+const DebugSectionAction = 'DebugSectionAction';
+const DebugSectionActions = 'DebugSectionActions';
 const DebugSectionHeader = 'DebugSectionHeader';
 const DebugValue = 'DebugValue';
-const DebugValueScopeName = 'DebugValueScopeName';
 const DebugValueBoolean = 'DebugValueBoolean';
 const DebugValueFunction = 'DebugValueFunction';
 const DebugValueGetter = 'DebugValueGetter';
 const DebugValueNumber = 'DebugValueNumber';
 const DebugValueObject = 'DebugValueObject';
+const DebugValueScopeName = 'DebugValueScopeName';
 const DebugValueString = 'DebugValueString';
 const DebugValueSymbol = 'DebugValueSymbol';
 const DebugValueUndefined = 'DebugValueUndefined';
+const DeleteWatchExpression = 'DeleteWatchExpression';
 const IconButton = 'IconButton';
+const InputBox = 'InputBox';
 const InputLabel = 'InputLabel';
-const DebugSectionActions = 'DebugSectionActions';
-const DebugSectionAction = 'DebugSectionAction';
-const DebugRowInputField = 'DebugRowInputField';
 
 const HandleClickCallStackItem = 'handleClickCallStackItem';
+const HandleClickWatchExpression = 'handleClickWatchExpression';
+const HandleClickWatchExpressionDelete = 'handleClickWatchExpressionDelete';
 const HandleClickCheckBox = 'handleClickCheckBox';
 const HandleClickContinue = 'handleClickContinue';
 const HandleClickDebugButton = 'handleClickDebugButton';
@@ -2877,6 +3128,7 @@ const HandleClickStepOver = 'handleClickStepOver';
 const HandleDebugInput = 'handleDebugInput';
 const HandleClickSectionAction = 'handleClickSectionAction';
 const HandleInputFieldChange = 'handleInputFieldChange';
+const HandleInputBlur = 'handleInputBlur';
 
 // TODo use same click event listener for all debug sections
 
@@ -3030,51 +3282,6 @@ const renderCheckBox = row => {
   }, text(text$1)];
 };
 
-const renderInputField = row => {
-  const {
-    text,
-    name
-  } = row;
-  return [{
-    type: Div,
-    className: mergeClassNames(DebugRow, DebugRowInputField),
-    role: TreeItem,
-    ariaLevel: 2,
-    childCount: 1
-  }, {
-    type: Input,
-    inputType: Text,
-    className: InputBox,
-    name,
-    value: text,
-    childCount: 0,
-    onInput: HandleInputFieldChange,
-    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 getDebugValueClassName = valueType => {
   switch (valueType) {
     case Undefined:
@@ -3129,25 +3336,84 @@ const renderValue = row => {
   }, 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 renderWatchExpression$1 = row => {
   const {
     value,
-    key
+    key,
+    index
   } = row;
   return [{
     type: Div,
     className: DebugRow,
     role: TreeItem,
-    childCount: 2
+    childCount: 4,
+    'data-index': index,
+    onClick: HandleClickWatchExpression // TODO use doubleclick
   }, {
     type: Span,
     className: DebugValueScopeName,
     childCount: 1
-  }, text(key), {
+  }, text(key), separator, {
     type: Span,
     className: DebugValue,
     childCount: 1
-  }, text(value)];
+  }, text(value), {
+    type: Button,
+    title: deleteWatchExpression(),
+    className: mergeClassNames(IconButton, DebugSectionAction, DeleteWatchExpression),
+    'data-index': index,
+    onClick: HandleClickWatchExpressionDelete,
+    childCount: 1
+  }, text('×')];
 };
 
 const renderWatchMessage = row => {
@@ -3554,7 +3820,7 @@ const getRunAndDebugVisibleRowsScope = state => {
 const formatValue = value => {
   return value === null || value === undefined ? '' : String(value);
 };
-const renderWatchExpression = (expression, value, isEditing) => {
+const renderWatchExpression = (expression, value, isEditing, index) => {
   if (isEditing) {
     return {
       type: InputField,
@@ -3565,7 +3831,8 @@ const renderWatchExpression = (expression, value, isEditing) => {
       indent: 0,
       valueType: '',
       name: WatchExpressionInput,
-      description: ''
+      description: '',
+      index
     };
   }
   return {
@@ -3577,7 +3844,8 @@ const renderWatchExpression = (expression, value, isEditing) => {
     indent: 0,
     valueType: '',
     name: '',
-    description: ''
+    description: '',
+    index
   };
 };
 const getRunAndDebugVisibleRowsWatchContent = watchExpressions => {
@@ -3596,7 +3864,9 @@ const getRunAndDebugVisibleRowsWatchContent = watchExpressions => {
     });
   } else {
     for (const watchExpression of watchExpressions) {
-      rows.push(renderWatchExpression(watchExpression.expression, watchExpression.value, watchExpression.isEditing || false));
+      // TODO simplify index
+      const index = watchExpressions.indexOf(watchExpression);
+      rows.push(renderWatchExpression(watchExpression.expression, watchExpression.value, watchExpression.isEditing || false, index));
     }
   }
   return rows;
@@ -3647,6 +3917,17 @@ const renderItems = (oldState, newState) => {
   return ['Viewlet.setDom2', newState.id, dom];
 };
 
+const renderSelection = (oldState, newState) => {
+  const {
+    editingselectionstart,
+    editingselectionend,
+    focus,
+    id
+  } = newState;
+  const selector = getFocusSelector(focus);
+  return ['Viewlet.setSelectionByName', id, selector, editingselectionstart, editingselectionend];
+};
+
 const getRenderer = diffType => {
   switch (diffType) {
     case RenderItems:
@@ -3655,6 +3936,10 @@ const getRenderer = diffType => {
       return renderFocusContext;
     case RenderFocus:
       return renderFocus;
+    case RenderValue:
+      return renderInputValue;
+    case RenderSelection:
+      return renderSelection;
     default:
       throw new Error('unknown renderer');
   }
@@ -3673,8 +3958,8 @@ const render2 = (uid, diffResult) => {
   const {
     oldState,
     newState
-  } = get$1(uid);
-  set$4(uid, newState, newState);
+  } = get(uid);
+  set(uid, newState, newState);
   const commands = applyRender(oldState, newState, diffResult);
   return commands;
 };
@@ -3761,7 +4046,7 @@ const getRunAndDebugButtonsVirtualDom = debugState => {
 const renderActions = uid => {
   const {
     newState
-  } = get$1(uid);
+  } = get(uid);
   const {
     scopeExpanded
   } = newState;
@@ -3820,6 +4105,13 @@ const renderEventListeners = () => {
   }, {
     name: HandleClickCallStackItem,
     params: ['handleClickCallStackItem', 'event.target.dataset.index']
+  }, {
+    name: HandleClickWatchExpression,
+    params: ['handleClickWatchExpression', 'event.target.dataset.index', 'event.defaultPrevented']
+  }, {
+    name: HandleClickWatchExpressionDelete,
+    params: ['handleClickWatchExpressionDelete', 'event.target.dataset.index'],
+    preventDefault: true
   }, {
     name: HandleClickScopeValue,
     params: ['handleClickScopeValue', 'event.target.dataset.name']
@@ -3829,12 +4121,49 @@ const renderEventListeners = () => {
   }, {
     name: HandleClickSectionAction,
     params: ['handleClickSectionAction', 'event.target.name']
+  }, {
+    name: HandleInputBlur,
+    params: ['handleInputBlur']
   }];
 };
 
-const saveState = uid => {
+const SaveStateReasonHotReload = 1;
+
+const saveState = (uid, reason) => {
+  const {
+    newState
+  } = get(uid);
+  const {
+    watchExpressions,
+    scopeExpanded,
+    watchExpanded,
+    breakPointsExpanded,
+    focus,
+    editingValue,
+    inputSource
+  } = newState;
+  if (reason === SaveStateReasonHotReload) {
+    return {
+      watchExpressions,
+      scopeExpanded,
+      breakPointsExpanded,
+      watchExpanded,
+      focus,
+      editingValue,
+      inputSource
+    };
+  }
   return {
-    x: 1
+    watchExpressions: watchExpressions.map(expr => ({
+      ...expr,
+      isEditing: false
+    })),
+    scopeExpanded,
+    breakPointsExpanded,
+    watchExpanded,
+    focus: 0,
+    editingValue: '',
+    inputSource: 0
   };
 };
 
@@ -3843,14 +4172,15 @@ const terminate = () => {
 };
 
 const commandMap = {
+  'Debug.handleChange': handleChange$1,
   'Debug.paused': paused,
   'Debug.resumed': resumed,
   'Debug.scriptParsed': scriptParsed,
-  'Debug.handleChange': handleChange$1,
   'Initialize.initialize': initialize,
-  'RunAndDebug.create': create$1,
+  'RunAndDebug.create': create,
   'RunAndDebug.diff2': diff2,
   'RunAndDebug.dispose': dispose,
+  'RunAndDebug.restoreState': restoreState,
   'RunAndDebug.focusNext': wrapCommand(focusNext),
   'RunAndDebug.focusPrevious': wrapCommand(focusPrevious),
   'RunAndDebug.getCommandIds': getCommandIds,
@@ -3860,6 +4190,7 @@ const commandMap = {
   'RunAndDebug.handleArrowLeft': wrapCommand(handleArrowLeft),
   'RunAndDebug.handleArrowRight': wrapCommand(handleArrowRight),
   'RunAndDebug.handleArrowUp': wrapCommand(handleArrowUp),
+  'RunAndDebug.handleClickCallStackItem': wrapCommand(handleClickCallstackItem),
   'RunAndDebug.handleClickCheckBox': wrapCommand(handleClickCheckBox),
   'RunAndDebug.handleClickDebugButton': wrapCommand(handleClickDebugButton),
   'RunAndDebug.handleClickPauseOnExceptions': wrapCommand(handleClickPauseOnExceptions),
@@ -3868,11 +4199,15 @@ const commandMap = {
   'RunAndDebug.handleClickSectionAction': wrapCommand(handleClickSectionAction),
   'RunAndDebug.handleClickSectionBreakPoints': wrapCommand(handleClickSectionBreakPoints),
   'RunAndDebug.handleClickSectionCallstack': wrapCommand(handleClickSectionCallstack),
-  'RunAndDebug.handleClickCallStackItem': wrapCommand(handleClickCallstackItem),
   'RunAndDebug.handleClickSectionHeading': wrapCommand(handleClickSectionHeading),
   'RunAndDebug.handleClickSectionScope': wrapCommand(handleClickSectionScope),
+  'RunAndDebug.handleClickWatchExpression': wrapCommand(handleClickWatchExpression),
+  'RunAndDebug.handleWatchExpressionDoubleClick': wrapCommand(handleWatchExpressionDoubleClick),
+  'RunAndDebug.handleClickWatchExpressionDelete': wrapCommand(handleClickWatchExpressionDelete),
+  'RunAndDebug.handleClickSectionWatch': wrapCommand(handleClickSectionWatch),
   'RunAndDebug.handleDebugInput': wrapCommand(handleDebugInput),
   'RunAndDebug.handleEvaluate': wrapCommand(handleEvaluate),
+  'RunAndDebug.handleWatchValueChange': wrapCommand(handleWatchValueChange),
   // eslint-disable-next-line  @typescript-eslint/no-deprecated
   'RunAndDebug.handlePaused': wrapCommand(handlePaused),
   'RunAndDebug.addWatchExpression': wrapCommand(addWatchExpression),
@@ -3880,6 +4215,7 @@ const commandMap = {
   'RunAndDebug.acceptWatchExpressionEdit': wrapCommand(acceptWatchExpressionEdit),
   'RunAndDebug.handleChange': wrapCommand(handleChange),
   'RunAndDebug.handleInputFieldChange': wrapCommand(handleInputFieldChange),
+  'RunAndDebug.handleInputBlur': wrapCommand(handleInputBlur),
   'RunAndDebug.handleResumed': wrapCommand(handleResumed),
   'RunAndDebug.handleScriptParsed': wrapCommand(handleScriptParsed),
   'RunAndDebug.loadContent': wrapCommand(loadContent),
@@ -3888,6 +4224,7 @@ const commandMap = {
   'RunAndDebug.readFile': readFile,
   'RunAndDebug.refresh': wrapCommand(refresh),
   'RunAndDebug.removeWatchExpression': removeWatchExpression,
+  'RunAndDebug.deleteWatchExpression': deleteWatchExpression$1,
   'RunAndDebug.render2': render2,
   'RunAndDebug.renderActions': renderActions,
   'RunAndDebug.renderEventListeners': renderEventListeners,
@@ -3906,7 +4243,7 @@ const listen = async () => {
   const rpc = await WebWorkerRpcClient.create({
     commandMap: commandMap
   });
-  set$2(rpc);
+  set$3(rpc);
 };
 
 const main = async () => {