Add ability to compare selected or open file with an IFS or local file path #2049

julesyan · 2024-05-11T21:10:02Z

Changes

Based on #1902

Added ability to compare with local files (even when IBM i is not connected)
- Context menu item shows in Object Browser and IFS Browser
- Context menu item also shows in VSCode's File Explorer, it does not show when selecting folders
- Command palette uses currently active file
Added ability to compare with stream files
- Context menu item shows in Object Browser and IFS Browser
- Context menu item also shows in VSCode's File Explorer, it does not show when selecting folders
- Command palette uses currently active file

How to test this PR

compare with local file (IBM i does not need to be connected, except for option 1):
- Option 1: Right click file in IFS/Object view, select "Compare with local file...", enter in local file path
- Option 2: Have a file open, open command palette, select "Compare with local file...", enter in local file path
- Option 3: Rick click file in VSCode's File Explorer view, select "Compare with local file...", enter in local file path
compare with IFS file (IBM i must be connected):
- Option 1: Right click file in IFS/Object view, select "Compare with IFS file...", enter in IFS file path
- Option 2: Have a file open, open command palette, select "Compare with IFS file...", enter in IFS file path
- Option 3: Rick click file in VSCode's File Explorer view, select "Compare with IFS file...", enter in IFS file path

Checklist

have tested my change
have created one or more test cases
updated relevant documentation
Remove any/all console.logs I added
have added myself to the contributors' list in CONTRIBUTING.md

…l file

julesyan · 2024-05-14T23:09:01Z

Added ability to compare with Active File:

Option 1: Right click file in IFS/Object view, select "Compare with Active File"
Option 2: Have a file open, open "Go to file..." from Object browser or command palette, click split editor icon on a path
Option 3: Rick click file in VSCode's File Explorer view, select "Compare with Active File"

.gitignore

This reverts commit f6afeaa.

worksofliam

I have left a quick review. Lack of member support is really the only major issue.

Also, can you please also add code-for-ibmi.compareCurrentFileWithMember?

src/instantiate.ts

julesyan · 2024-05-17T02:19:15Z

Added ability to compare with members (IBM i must be connected):

Option 1: Right click file in IFS/Object view, select "Compare with member...", enter in member path
Option 2: Have a file open, open command palette, select "Compare with member...", enter in member path
Option 3: Rick click file in VSCode's File Explorer view, select "Compare with member...", enter in member path

package.json

src/instantiate.ts

chrjorgensen

@julesyan Should we get this PR going? I have made some comments regarding the UX, which I hope you can fix. 🙏

src/instantiate.ts

chrjorgensen · 2024-07-01T08:00:53Z

src/instantiate.ts

@@ -17,6 +17,7 @@ import { t } from './locale';
 import { Action, BrowserItem, DeploymentMethod, MemberItem, OpenEditableOptions, WithPath } from "./typings";
 import { ActionsUI } from './webviews/actions';
 import { VariablesUI } from "./webviews/variables";
+import { t } from './locale';


t is already imported...

I get errors when i remove it, where is it imported?

I see this when I check out the PR:

I will fix this... no worries...

chrjorgensen

@julesyan Only two small issues and then we're good to go! 👍

chrjorgensen

@julesyan Well done - works as expected. 👍

Approved and merged.

chrjorgensen · 2024-07-17T09:28:48Z

@worksofliam I think this merged PR fixes issue #1902 right?

Julia Yan added 6 commits May 11, 2024 16:41

Add ability to compare selected or open file with an IFS file or loca…

aa2562c

…l file

Fix compare with members

480477e

Allow local file comparison to be independent of IBM i connection

ab09981

Only allow compare of local when it is a file

ce921e3

Fix menu showing for folders

00db2c9

Fix formatting

3694c27

worksofliam requested review from worksofliam and sebjulliand May 14, 2024 13:14

Julia Yan and others added 2 commits May 14, 2024 19:04

Add ability to compare with current file

fdd8a6e

Merge branch 'master' into compareFiles

3c78f27

Add .vscode to gitignore

f6afeaa

sebjulliand reviewed May 15, 2024

View reviewed changes

.gitignore Outdated Show resolved Hide resolved

Revert "Add .vscode to gitignore"

32f9185

This reverts commit f6afeaa.

julesyan requested a review from sebjulliand May 15, 2024 12:01

worksofliam requested changes May 15, 2024

View reviewed changes

src/instantiate.ts Outdated Show resolved Hide resolved

src/instantiate.ts Outdated Show resolved Hide resolved

src/instantiate.ts Outdated Show resolved Hide resolved

Julia Yan added 2 commits May 16, 2024 21:49

add support for member files

726d134

Add support for member files when comparing through Go to file

278a55b

julesyan requested a review from worksofliam May 17, 2024 02:07

Allow member paths to not start with /

a0d90f5

chrjorgensen self-requested a review June 22, 2024 21:19

chrjorgensen reviewed Jun 22, 2024

View reviewed changes

package.json Outdated Show resolved Hide resolved

chrjorgensen reviewed Jun 22, 2024

View reviewed changes

package.json Outdated Show resolved Hide resolved

chrjorgensen reviewed Jun 22, 2024

View reviewed changes

src/instantiate.ts Outdated Show resolved Hide resolved

chrjorgensen requested changes Jun 22, 2024

View reviewed changes

Update to use submenus

bcb6067

julesyan requested a review from chrjorgensen June 28, 2024 14:07

Merge branch 'master' into compareFiles

f3c9828

chrjorgensen reviewed Jul 1, 2024

View reviewed changes

src/instantiate.ts Outdated Show resolved Hide resolved

chrjorgensen reviewed Jul 1, 2024

View reviewed changes

chrjorgensen self-requested a review July 1, 2024 08:15

chrjorgensen added 2 commits July 1, 2024 10:22

Add Danish translations

af7183f

Add placeholders in other languages

2e4fdb9

chrjorgensen requested changes Jul 1, 2024

View reviewed changes

worksofliam assigned julesyan Jul 1, 2024

Fix indentation

33b5b25

julesyan requested a review from chrjorgensen July 6, 2024 12:39

Remove duplicate import

63349e6

chrjorgensen approved these changes Jul 6, 2024

View reviewed changes

chrjorgensen merged commit 361ba40 into codefori:master Jul 6, 2024
1 check passed

chrjorgensen mentioned this pull request Jul 17, 2024

Be able to compare active editor to another path #1902

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add ability to compare selected or open file with an IFS or local file path #2049

Add ability to compare selected or open file with an IFS or local file path #2049

julesyan commented May 11, 2024 •

edited

Loading

julesyan commented May 14, 2024

worksofliam left a comment

julesyan commented May 17, 2024

chrjorgensen left a comment

chrjorgensen Jul 1, 2024

julesyan Jul 6, 2024

chrjorgensen Jul 6, 2024

chrjorgensen left a comment

chrjorgensen left a comment

chrjorgensen commented Jul 17, 2024

Add ability to compare selected or open file with an IFS or local file path #2049

Add ability to compare selected or open file with an IFS or local file path #2049

Conversation

julesyan commented May 11, 2024 • edited Loading

Changes

How to test this PR

Checklist

julesyan commented May 14, 2024

worksofliam left a comment

Choose a reason for hiding this comment

julesyan commented May 17, 2024

chrjorgensen left a comment

Choose a reason for hiding this comment

chrjorgensen Jul 1, 2024

Choose a reason for hiding this comment

julesyan Jul 6, 2024

Choose a reason for hiding this comment

chrjorgensen Jul 6, 2024

Choose a reason for hiding this comment

chrjorgensen left a comment

Choose a reason for hiding this comment

chrjorgensen left a comment

Choose a reason for hiding this comment

chrjorgensen commented Jul 17, 2024

julesyan commented May 11, 2024 •

edited

Loading