vzcode 0.64.0 → 0.66.0

package/src/client/useTypeScript/worker.ts

@@ -94,17 +94,25 @@ const convertToCodeMirrorDiagnostic = (
   }));
 };
 
+// This is a promise that resolves when the file system is initialized.
+let fileSystemInitializationPromise = null;
+async function ensureFileSystemInitialized() {
+  if (!fileSystemInitializationPromise) {
+    fileSystemInitializationPromise =
+      initializeFileSystem();
+  }
+  await fileSystemInitializationPromise;
+}
+
 onmessage = async ({ data }) => {
   if (debug) {
     console.log('message received');
   }
-  // Initialize the file system.
-  if (!isFileSystemInitialized) {
-    isFileSystemInitialized = true;
-    await initializeFileSystem();
-  }
 
-  // Sanity check.
+  // Ensure the file system is initialized.
+  await ensureFileSystemInitialized();
+
+  // Sanity check - should never happen.
   if (env === null) {
     throw new Error('File system not initialized');
   }

package/src/client/vzReducer/index.ts

@@ -3,6 +3,10 @@ import { ThemeLabel } from '../themes';
 import { closeTabsReducer } from './closeTabsReducer';
 import { openTabReducer } from './openTabReducer';
 import { setActiveFileIdReducer } from './setActiveFileIdReducer';
+import {
+  setActiveFileLeftReducer,
+  setActiveFileRightReducer,
+} from './setActiveFileLeftRightReducer';
 import { setIsSettingsOpenReducer } from './setIsSettingsOpenReducer';
 import { setThemeReducer } from './setThemeReducer';
 import { editorNoLongerWantsFocusReducer } from './editorNoLongerWantsFocusReducer';
@@ -38,6 +42,12 @@ export type VZAction =
   //  * Sets the active file ID.
   | { type: 'set_active_file_id'; activeFileId: FileId }
 
+  // `set_active_file_left' 'set_active_file_right`
+  //  * Sets the active file ID to be the tab directly to the left or right
+  //  * of the currently active tab.
+  | { type: 'set_active_file_left' }
+  | { type: 'set_active_file_right' }
+
   // `open_tab`
   //  * Opens a tab.
   //  * Also serves to change an already open transient tab to persistent.
@@ -88,6 +98,8 @@ export type TabState = {
 
 const reducers = [
   setActiveFileIdReducer,
+  setActiveFileLeftReducer,
+  setActiveFileRightReducer,
   openTabReducer,
   closeTabsReducer,
   setThemeReducer,

package/src/client/vzReducer/setActiveFileLeftRightReducer.ts

@@ -0,0 +1,47 @@
+import { VZAction, VZState } from '.';
+
+export const setActiveFileLeftReducer = (
+  state: VZState,
+  action: VZAction,
+): VZState => {
+  if (action.type !== 'set_active_file_left') {
+    return state;
+  }
+
+  let index = state.tabList.findIndex(
+    (tab) => tab.fileId === state.activeFileId,
+  );
+
+  index -= 1;
+  if (index < 0) {
+    index = state.tabList.length - 1;
+  }
+
+  return {
+    ...state,
+    activeFileId: state.tabList[index].fileId,
+  };
+};
+
+export const setActiveFileRightReducer = (
+  state: VZState,
+  action: VZAction,
+): VZState => {
+  if (action.type !== 'set_active_file_right') {
+    return state;
+  }
+
+  let index = state.tabList.findIndex(
+    (tab) => tab.fileId === state.activeFileId,
+  );
+
+  index += 1;
+  if (index > state.tabList.length - 1) {
+    index = 0;
+  }
+
+  return {
+    ...state,
+    activeFileId: state.tabList[index].fileId,
+  };
+};