Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: no infinite running command notification for diff file and folder commands #5722

Merged
merged 4 commits into from
Aug 14, 2024
Merged

fix: no infinite running command notification for diff file and folder commands #5722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d25869f
fix: no infinite running command notification for diff file and folde…
CristiCanizales Aug 13, 2024
79d6e4d
chore: use void and remove await
CristiCanizales Aug 14, 2024
1fff70d
chore: update labels for diff folder
CristiCanizales Aug 14, 2024
79820cb
Merge branch 'develop' into cristi/infinite-notif-diff
CristiCanizales Aug 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/salesforcedx-vscode-core/src/commands/sourceDiff.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ export const sourceFolderDiff = async (explorerPath: vscode.Uri) => {
new FilePathGatherer(explorerPath),
new MetadataCacheExecutor(
username,
'Source Diff',
nls.localize('source_diff_folder_text'),
'source-diff-loader',
handleCacheResults
)
Expand All @@ -105,11 +105,11 @@ export const handleCacheResults = async (
username
);
} else if (cache.selectedType === PathType.Folder) {
await differ.diffFolder(cache, username);
differ.diffFolder(cache, username);
}
} else {
const message = nls.localize('source_diff_components_not_in_org');
await notificationService.showErrorMessage(message);
void notificationService.showErrorMessage(message);
throw new Error(message);
}
};
1 change: 1 addition & 0 deletions packages/salesforcedx-vscode-core/src/messages/i18n.ja.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,6 +513,7 @@ export const messages = {
conflict_detect_diff_command_title: 'ファイルを比較',

source_diff_text: 'SFDX: 組織のファイルとの差分を表示',
source_diff_folder_text: 'SFDX: Diff Folder Against Org',
source_diff_components_not_in_org:
'Selected components are not available in the org',
source_diff_unsupported_type:
Expand Down
8 changes: 4 additions & 4 deletions packages/salesforcedx-vscode-core/src/messages/i18n.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -626,6 +626,7 @@ export const messages = {
conflict_detect_local_last_modified_date: 'Local last sync date: %s',

source_diff_text: 'SFDX: Diff File Against Org',
source_diff_folder_text: 'SFDX: Diff Folder Against Org',
source_diff_components_not_in_org:
'Selected components are not available in the org',
source_diff_unsupported_type:
Expand Down Expand Up @@ -660,8 +661,7 @@ export const messages = {
sobjects_no_refresh_if_already_active_error_text:
'A refresh of your sObject definitions is already underway. If you need to restart the process, cancel the running task.',
rename_lightning_component: 'SFDX: Rename Component',
component_input_dup_error:
'Component name is already in use in LWC or Aura',
component_input_dup_error: 'Component name is already in use in LWC or Aura',
rename_component_input_dup_file_name_error:
'This file name is already in use in the current component directory. Choose a different name and try again.',
rename_component_input_placeholder: 'Enter a unique component name',
Expand Down Expand Up @@ -702,6 +702,6 @@ export const messages = {
input_no_component_name: 'Input does not contain component name',
component_empty: 'Component cannot be empty',
create_not_supported: 'Create is not supported for multiple components',
input_incorrect_properties: 'Input does not contain correct component properties'

input_incorrect_properties:
'Input does not contain correct component properties'
};
Loading