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

Jump to bottom

Add tips for debug views #205861

Merged
merged 3 commits into from
Feb 21, 2024
Merged

Add tips for debug views #205861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4b4f9ad
Add tips for debug views
yiliang114 Feb 21, 2024
16d7d5a
Add tips for debug views
yiliang114 Feb 21, 2024
5751935
Merge branch 'main' into vitreous-herring
yiliang114 Feb 21, 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
2 changes: 1 addition & 1 deletion src/vs/platform/environment/node/argv.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ export interface ErrorReporter {
onEmptyValue(id: string): void;
onDeprecatedOption(deprecatedId: string, message: string): void;

getSubcommandReporter?(commmand: string): ErrorReporter;
getSubcommandReporter?(command: string): ErrorReporter;
}

const ignoringReporter = {
Expand Down
5 changes: 3 additions & 2 deletions src/vs/workbench/contrib/debug/browser/welcomeView.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,9 @@ viewsRegistry.registerViewWelcomeContent(WelcomeView.ID, {
{
key: 'customizeRunAndDebugOpenFolder',
comment: [
'Please do not translate the word "commmand", it is part of our internal syntax which must not change',
'{Locked="](command:{0})"}'
'Please do not translate the word "command", it is part of our internal syntax which must not change',
'Please do not translate "launch.json", it is the specific configuration file name',
'{Locked="](command:{0})"}',
]
},
"To customize Run and Debug, [open a folder](command:{0}) and create a launch.json file.", (isMacintosh && !isWeb) ? OpenFileFolderAction.ID : OpenFolderAction.ID),
Expand Down
10 changes: 5 additions & 5 deletions src/vs/workbench/contrib/files/browser/explorerViewlet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ const openRecentButton = `[${openRecent}](command:${OpenRecentAction.ID})`;

const viewsRegistry = Registry.as<IViewsRegistry>(Extensions.ViewsRegistry);
viewsRegistry.registerViewWelcomeContent(EmptyView.ID, {
content: localize({ key: 'noWorkspaceHelp', comment: ['Please do not translate the word "commmand", it is part of our internal syntax which must not change'] },
content: localize({ key: 'noWorkspaceHelp', comment: ['Please do not translate the word "command", it is part of our internal syntax which must not change'] },
"You have not yet added a folder to the workspace.\n{0}", addRootFolderButton),
when: ContextKeyExpr.and(
// inside a .code-workspace
Expand All @@ -296,7 +296,7 @@ viewsRegistry.registerViewWelcomeContent(EmptyView.ID, {
});

viewsRegistry.registerViewWelcomeContent(EmptyView.ID, {
content: localize({ key: 'noFolderHelpWeb', comment: ['Please do not translate the word "commmand", it is part of our internal syntax which must not change'] },
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could many comments here be deleted in fact? Because there is no command string in the actual copy.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's possible, but I don't want to do that for another feature area in this PR

content: localize({ key: 'noFolderHelpWeb', comment: ['Please do not translate the word "command", it is part of our internal syntax which must not change'] },
"You have not yet opened a folder.\n{0}\n{1}", openFolderViaWorkspaceButton, openRecentButton),
when: ContextKeyExpr.and(
// inside a .code-workspace
Expand All @@ -309,7 +309,7 @@ viewsRegistry.registerViewWelcomeContent(EmptyView.ID, {
});

viewsRegistry.registerViewWelcomeContent(EmptyView.ID, {
content: localize({ key: 'remoteNoFolderHelp', comment: ['Please do not translate the word "commmand", it is part of our internal syntax which must not change'] },
content: localize({ key: 'remoteNoFolderHelp', comment: ['Please do not translate the word "command", it is part of our internal syntax which must not change'] },
"Connected to remote.\n{0}", openFolderButton),
when: ContextKeyExpr.and(
// not inside a .code-workspace
Expand All @@ -323,7 +323,7 @@ viewsRegistry.registerViewWelcomeContent(EmptyView.ID, {
});

viewsRegistry.registerViewWelcomeContent(EmptyView.ID, {
content: localize({ key: 'noFolderButEditorsHelp', comment: ['Please do not translate the word "commmand", it is part of our internal syntax which must not change'] },
content: localize({ key: 'noFolderButEditorsHelp', comment: ['Please do not translate the word "command", it is part of our internal syntax which must not change'] },
"You have not yet opened a folder.\n{0}\nOpening a folder will close all currently open editors. To keep them open, {1} instead.", openFolderButton, addAFolderButton),
when: ContextKeyExpr.and(
// editors are opened
Expand All @@ -340,7 +340,7 @@ viewsRegistry.registerViewWelcomeContent(EmptyView.ID, {
});

viewsRegistry.registerViewWelcomeContent(EmptyView.ID, {
content: localize({ key: 'noFolderHelp', comment: ['Please do not translate the word "commmand", it is part of our internal syntax which must not change'] },
content: localize({ key: 'noFolderHelp', comment: ['Please do not translate the word "command", it is part of our internal syntax which must not change'] },
"You have not yet opened a folder.\n{0}", openFolderButton),
when: ContextKeyExpr.and(
// no editor is open
Expand Down
Loading