@lvce-editor/explorer-view 6.4.0 → 6.6.0

package/dist/explorerViewWorkerMain.js

@@ -927,6 +927,7 @@ const CollapseAllFoldersInExplorer = 'Collapse All Folders in Explorer';
 const Copy = 'Copy';
 const CopyPath = 'Copy Path';
 const CopyRelativePath = 'Copy Relative Path';
+const CompareWithSelected = 'Compare with Selected';
 const Cut = 'Cut';
 const Delete = 'Delete';
 const FileNameCannotStartWithSlash = 'A file or folder name cannot start with a slash.';
@@ -944,6 +945,7 @@ const Paste = 'Paste';
 const RefreshExplorer = 'Refresh Explorer';
 const RemoveFolderFromWorkspace = 'Remove folder from workspace';
 const Rename = 'Rename';
+const SelectForCompare = 'Select for Compare';
 const TheNameIsNotValid = 'The name **{0}** is not valid as a file or folder name. Please choose a different name.';
 const TypeAFileName = 'Type file name. Press Enter to confirm or Escape to cancel.'; // TODO use keybinding
 const YouHaveNotYetOpenedAFolder = 'You have not yet opened a folder.';
@@ -975,6 +977,12 @@ const copyPath$1 = () => {
 const copyRelativePath$1 = () => {
   return i18nString(CopyRelativePath);
 };
+const compareWithSelected$1 = () => {
+  return i18nString(CompareWithSelected);
+};
+const selectForCompare$1 = () => {
+  return i18nString(SelectForCompare);
+};
 const rename = () => {
   return i18nString(Rename);
 };
@@ -1321,6 +1329,36 @@ const collapseAll = async state => {
   };
 };
 
+const getFocusedFile = state => {
+  if (state.focusedIndex < 0 || state.focusedIndex >= state.items.length) {
+    return undefined;
+  }
+  const item = state.items[state.focusedIndex];
+  if (item.type !== File) {
+    return undefined;
+  }
+  return item;
+};
+
+const openDiff = async (leftUri, rightUri, focus) => {
+  await openUri$1(`diff://${leftUri}<->${rightUri}`, focus);
+};
+
+const compareWithSelected = async state => {
+  const focusedFile = getFocusedFile(state);
+  if (!focusedFile) {
+    return state;
+  }
+  if (!state.compareSourceUri || state.compareSourceUri === focusedFile.path) {
+    return state;
+  }
+  await openDiff(state.compareSourceUri, focusedFile.path, true);
+  return {
+    ...state,
+    compareSourceUri: ''
+  };
+};
+
 const getFocusedDirent$1 = state => {
   const {
     focusedIndex,
@@ -2021,6 +2059,7 @@ const Slash = '/';
 const create$8 = (id, uri, x, y, width, height, args, parentUid, platform = 0, assetDir = '') => {
   const state = {
     assetDir,
+    compareSourceUri: '',
     confirmDelete: false,
     confirmPaste: false,
     cutItems: [],
@@ -2560,6 +2599,18 @@ const menuEntryCopyRelativePath = {
   id: 'copyRelativePath',
   label: copyRelativePath$1()
 };
+const menuEntrySelectForCompare = {
+  command: 'Explorer.selectForCompare',
+  flags: RestoreFocus,
+  id: 'selectForCompare',
+  label: selectForCompare$1()
+};
+const menuEntryCompareWithSelected = {
+  command: 'Explorer.compareWithSelected',
+  flags: RestoreFocus,
+  id: 'compareWithSelected',
+  label: compareWithSelected$1()
+};
 const menuEntryRename = {
   command: 'Explorer.renameDirent',
   flags: None$2,
@@ -2593,7 +2644,10 @@ const getMenuEntriesDirectory = () => {
   return ALL_ENTRIES;
 };
 const getMenuEntriesFile = () => {
-  return [menuEntryOpenContainingFolder, menuEntryOpenInIntegratedTerminal, menuEntrySeparator, menuEntryCut, menuEntryCopy, menuEntryPaste, menuEntrySeparator, menuEntryCopyPath, menuEntryCopyRelativePath, menuEntrySeparator, menuEntryRename, menuEntryDelete];
+  return [menuEntryOpenContainingFolder, menuEntryOpenInIntegratedTerminal, menuEntrySeparator, menuEntryCut, menuEntryCopy, menuEntryPaste, menuEntrySeparator, menuEntryCopyPath, menuEntryCopyRelativePath, menuEntrySeparator, menuEntrySelectForCompare, menuEntrySeparator, menuEntryRename, menuEntryDelete];
+};
+const getMenuEntriesFileCompareWithSelected = () => {
+  return [menuEntryOpenContainingFolder, menuEntryOpenInIntegratedTerminal, menuEntrySeparator, menuEntryCut, menuEntryCopy, menuEntryPaste, menuEntrySeparator, menuEntryCopyPath, menuEntryCopyRelativePath, menuEntrySeparator, menuEntryCompareWithSelected, menuEntrySeparator, menuEntryRename, menuEntryDelete];
 };
 const getMenuEntriesDefault = () => {
   return ALL_ENTRIES;
@@ -2614,6 +2668,9 @@ const getMenuEntries = state => {
     case Directory:
       return getMenuEntriesDirectory();
     case File:
+      if (state.compareSourceUri && state.compareSourceUri !== focusedDirent.path) {
+        return getMenuEntriesFileCompareWithSelected();
+      }
       return getMenuEntriesFile();
     default:
       return getMenuEntriesDefault();
@@ -4204,8 +4261,12 @@ const handleIconThemeChange = state => {
 const handleInputBlur = async state => {
   const {
     editingErrorMessage,
+    editingIndex,
     editingValue
   } = state;
+  if (editingIndex === -1) {
+    return state;
+  }
   if (editingErrorMessage || !editingValue) {
     return cancelEditInternal(state, false);
   }
@@ -5727,6 +5788,17 @@ const selectDown = state => {
   };
 };
 
+const selectForCompare = state => {
+  const focusedFile = getFocusedFile(state);
+  if (!focusedFile) {
+    return state;
+  }
+  return {
+    ...state,
+    compareSourceUri: focusedFile.path
+  };
+};
+
 const setSelectedIndices = (state, indices) => {
   const {
     items
@@ -5814,6 +5886,7 @@ const commandMap = {
   'Explorer.cancelEdit': wrapListItemCommand(cancelEdit),
   'Explorer.cancelTypeAhead': wrapListItemCommand(cancelTypeAhead),
   'Explorer.collapseAll': wrapListItemCommand(collapseAll),
+  'Explorer.compareWithSelected': wrapListItemCommand(compareWithSelected),
   'Explorer.copyPath': wrapListItemCommand(copyPath),
   'Explorer.copyRelativePath': wrapListItemCommand(copyRelativePath),
   'Explorer.create': create$8,
@@ -5885,6 +5958,7 @@ const commandMap = {
   'Explorer.saveState': wrapGetter(saveState),
   'Explorer.selectAll': wrapListItemCommand(selectAll),
   'Explorer.selectDown': wrapListItemCommand(selectDown),
+  'Explorer.selectForCompare': wrapListItemCommand(selectForCompare),
   'Explorer.selectIndices': wrapListItemCommand(setSelectedIndices),
   'Explorer.selectUp': wrapListItemCommand(selectUp),
   'Explorer.setDeltaY': wrapListItemCommand(setDeltaY),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/explorer-view",
-  "version": "6.4.0",
+  "version": "6.6.0",
   "description": "Explorer Worker",
   "repository": {
     "type": "git",