From 7907870362aaaf7fab0df23474c986c3f5a80dd0 Mon Sep 17 00:00:00 2001 From: Michelle Matias <38734287+michelleangela@users.noreply.github.com> Date: Tue, 24 Sep 2019 11:27:48 -0700 Subject: [PATCH] Use VSCode icons for reference types (#4321) --- Extension/assets/ref-canceled-dark.svg | 4 +++- Extension/assets/ref-canceled-light.svg | 4 +++- Extension/assets/ref-cannot-confirm-dark.svg | 13 ++----------- Extension/assets/ref-cannot-confirm-light.svg | 13 ++----------- Extension/assets/ref-comment-dark.svg | 4 +++- Extension/assets/ref-comment-light.svg | 4 +++- .../assets/ref-confirmation-in-progress-dark.svg | 4 +++- .../assets/ref-confirmation-in-progress-light.svg | 4 +++- Extension/assets/ref-confirmed-dark.svg | 10 +--------- Extension/assets/ref-confirmed-light.svg | 10 +--------- Extension/assets/ref-group-by-file-dark.svg | 1 - Extension/assets/ref-group-by-file-light.svg | 1 - Extension/assets/ref-group-by-type-dark.svg | 2 +- Extension/assets/ref-group-by-type-light.svg | 2 +- Extension/assets/ref-inactive-dark.svg | 4 +++- Extension/assets/ref-inactive-light.svg | 4 +++- Extension/assets/ref-not-a-reference-dark.svg | 4 +++- Extension/assets/ref-not-a-reference-light.svg | 4 +++- Extension/assets/ref-string-dark.svg | 4 +++- Extension/assets/ref-string-light.svg | 4 +++- Extension/assets/ref-ungroup-by-type-dark.svg | 1 + Extension/assets/ref-ungroup-by-type-light.svg | 1 + Extension/package.json | 10 +++++----- Extension/package.nls.json | 2 +- Extension/src/LanguageServer/extension.ts | 2 +- 25 files changed, 53 insertions(+), 63 deletions(-) delete mode 100644 Extension/assets/ref-group-by-file-dark.svg delete mode 100644 Extension/assets/ref-group-by-file-light.svg create mode 100644 Extension/assets/ref-ungroup-by-type-dark.svg create mode 100644 Extension/assets/ref-ungroup-by-type-light.svg diff --git a/Extension/assets/ref-canceled-dark.svg b/Extension/assets/ref-canceled-dark.svg index 6b6662abf..893222d7e 100644 --- a/Extension/assets/ref-canceled-dark.svg +++ b/Extension/assets/ref-canceled-dark.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/Extension/assets/ref-canceled-light.svg b/Extension/assets/ref-canceled-light.svg index aa089e0eb..ccf5c3466 100644 --- a/Extension/assets/ref-canceled-light.svg +++ b/Extension/assets/ref-canceled-light.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/Extension/assets/ref-cannot-confirm-dark.svg b/Extension/assets/ref-cannot-confirm-dark.svg index 52b2eaa07..29e14faf8 100644 --- a/Extension/assets/ref-cannot-confirm-dark.svg +++ b/Extension/assets/ref-cannot-confirm-dark.svg @@ -1,12 +1,3 @@ - - - - - - - - - - ? - + + \ No newline at end of file diff --git a/Extension/assets/ref-cannot-confirm-light.svg b/Extension/assets/ref-cannot-confirm-light.svg index 14db5f9b3..ea2a8a428 100644 --- a/Extension/assets/ref-cannot-confirm-light.svg +++ b/Extension/assets/ref-cannot-confirm-light.svg @@ -1,12 +1,3 @@ - - - - - - - - - - ? - + + \ No newline at end of file diff --git a/Extension/assets/ref-comment-dark.svg b/Extension/assets/ref-comment-dark.svg index 396231a26..d8343c933 100644 --- a/Extension/assets/ref-comment-dark.svg +++ b/Extension/assets/ref-comment-dark.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/Extension/assets/ref-comment-light.svg b/Extension/assets/ref-comment-light.svg index 495324ee4..c8538f446 100644 --- a/Extension/assets/ref-comment-light.svg +++ b/Extension/assets/ref-comment-light.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/Extension/assets/ref-confirmation-in-progress-dark.svg b/Extension/assets/ref-confirmation-in-progress-dark.svg index 9eadfa50e..f7341bd56 100644 --- a/Extension/assets/ref-confirmation-in-progress-dark.svg +++ b/Extension/assets/ref-confirmation-in-progress-dark.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/Extension/assets/ref-confirmation-in-progress-light.svg b/Extension/assets/ref-confirmation-in-progress-light.svg index 30b874c6f..f2ee5a56c 100644 --- a/Extension/assets/ref-confirmation-in-progress-light.svg +++ b/Extension/assets/ref-confirmation-in-progress-light.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/Extension/assets/ref-confirmed-dark.svg b/Extension/assets/ref-confirmed-dark.svg index 57454b119..b85065470 100644 --- a/Extension/assets/ref-confirmed-dark.svg +++ b/Extension/assets/ref-confirmed-dark.svg @@ -1,11 +1,3 @@ - - - - - - - - - + \ No newline at end of file diff --git a/Extension/assets/ref-confirmed-light.svg b/Extension/assets/ref-confirmed-light.svg index 7522aa900..22bfe3504 100644 --- a/Extension/assets/ref-confirmed-light.svg +++ b/Extension/assets/ref-confirmed-light.svg @@ -1,11 +1,3 @@ - - - - - - - - - + \ No newline at end of file diff --git a/Extension/assets/ref-group-by-file-dark.svg b/Extension/assets/ref-group-by-file-dark.svg deleted file mode 100644 index a9d253660..000000000 --- a/Extension/assets/ref-group-by-file-dark.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/Extension/assets/ref-group-by-file-light.svg b/Extension/assets/ref-group-by-file-light.svg deleted file mode 100644 index 3dc0d4915..000000000 --- a/Extension/assets/ref-group-by-file-light.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/Extension/assets/ref-group-by-type-dark.svg b/Extension/assets/ref-group-by-type-dark.svg index c8fa8459c..7516a4c5e 100644 --- a/Extension/assets/ref-group-by-type-dark.svg +++ b/Extension/assets/ref-group-by-type-dark.svg @@ -1 +1 @@ - \ No newline at end of file +group-by-ref-type_16x \ No newline at end of file diff --git a/Extension/assets/ref-group-by-type-light.svg b/Extension/assets/ref-group-by-type-light.svg index 954fe3750..d9f79092d 100644 --- a/Extension/assets/ref-group-by-type-light.svg +++ b/Extension/assets/ref-group-by-type-light.svg @@ -1 +1 @@ - \ No newline at end of file +group-by-ref-type_16x \ No newline at end of file diff --git a/Extension/assets/ref-inactive-dark.svg b/Extension/assets/ref-inactive-dark.svg index 5e8758b49..69acc4f9f 100644 --- a/Extension/assets/ref-inactive-dark.svg +++ b/Extension/assets/ref-inactive-dark.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/Extension/assets/ref-inactive-light.svg b/Extension/assets/ref-inactive-light.svg index 4831c74fa..27807efcb 100644 --- a/Extension/assets/ref-inactive-light.svg +++ b/Extension/assets/ref-inactive-light.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/Extension/assets/ref-not-a-reference-dark.svg b/Extension/assets/ref-not-a-reference-dark.svg index c6ea8137d..fefdd4a23 100644 --- a/Extension/assets/ref-not-a-reference-dark.svg +++ b/Extension/assets/ref-not-a-reference-dark.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/Extension/assets/ref-not-a-reference-light.svg b/Extension/assets/ref-not-a-reference-light.svg index 296df2cd9..236c412a3 100644 --- a/Extension/assets/ref-not-a-reference-light.svg +++ b/Extension/assets/ref-not-a-reference-light.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/Extension/assets/ref-string-dark.svg b/Extension/assets/ref-string-dark.svg index a061100e4..e2e9f02db 100644 --- a/Extension/assets/ref-string-dark.svg +++ b/Extension/assets/ref-string-dark.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/Extension/assets/ref-string-light.svg b/Extension/assets/ref-string-light.svg index 1b1bdb605..54a81bfe8 100644 --- a/Extension/assets/ref-string-light.svg +++ b/Extension/assets/ref-string-light.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/Extension/assets/ref-ungroup-by-type-dark.svg b/Extension/assets/ref-ungroup-by-type-dark.svg new file mode 100644 index 000000000..ce63eecdb --- /dev/null +++ b/Extension/assets/ref-ungroup-by-type-dark.svg @@ -0,0 +1 @@ +ungroup-by-ref-type_16x \ No newline at end of file diff --git a/Extension/assets/ref-ungroup-by-type-light.svg b/Extension/assets/ref-ungroup-by-type-light.svg new file mode 100644 index 000000000..24114c9a5 --- /dev/null +++ b/Extension/assets/ref-ungroup-by-type-light.svg @@ -0,0 +1 @@ +ungroup-by-ref-type_16x \ No newline at end of file diff --git a/Extension/package.json b/Extension/package.json index a69a46f4a..207cae134 100644 --- a/Extension/package.json +++ b/Extension/package.json @@ -727,11 +727,11 @@ } }, { - "command": "C_Cpp.referencesViewGroupByFile", - "title": "%c_cpp.command.referencesViewGroupByFile.title%", + "command": "C_Cpp.referencesViewUngroupByType", + "title": "%c_cpp.command.referencesViewUngroupByType.title%", "icon": { - "light": "assets/ref-group-by-file-light.svg", - "dark": "assets/ref-group-by-file-dark.svg" + "light": "assets/ref-ungroup-by-type-light.svg", + "dark": "assets/ref-ungroup-by-type-dark.svg" } } ], @@ -1521,7 +1521,7 @@ "group": "navigation" }, { - "command": "C_Cpp.referencesViewGroupByFile", + "command": "C_Cpp.referencesViewUngroupByType", "when": "view == CppReferencesView && !refView.isGroupedByFile", "group": "navigation" }, diff --git a/Extension/package.nls.json b/Extension/package.nls.json index 13d23c775..5afc546fb 100644 --- a/Extension/package.nls.json +++ b/Extension/package.nls.json @@ -13,7 +13,7 @@ "c_cpp.command.buildAndDebugActiveFile.title": "Build and Debug Active File", "c_cpp.command.logDiagnostics.title": "Log Diagnostics", "c_cpp.command.referencesViewGroupByType.title": "Group by reference type", - "c_cpp.command.referencesViewGroupByFile.title": "Group by file", + "c_cpp.command.referencesViewUngroupByType.title": "Ungroup by reference type", "c_cpp.command.rescanWorkspace.title": "Rescan Workspace", "c_cpp.command.vcpkgClipboardInstallSuggested.title": "Copy vcpkg install command to clipboard", "c_cpp.command.vcpkgOnlineHelpSuggested.title": "Visit the vcpkg help page", diff --git a/Extension/src/LanguageServer/extension.ts b/Extension/src/LanguageServer/extension.ts index 3bfb16ce7..b971a0e69 100644 --- a/Extension/src/LanguageServer/extension.ts +++ b/Extension/src/LanguageServer/extension.ts @@ -871,7 +871,7 @@ export function registerCommands(): void { disposables.push(vscode.commands.registerCommand('C_Cpp.RescanWorkspace', onRescanWorkspace)); disposables.push(vscode.commands.registerCommand('C_Cpp.ShowReferenceItem', onShowRefCommand)); disposables.push(vscode.commands.registerCommand('C_Cpp.referencesViewGroupByType', onToggleRefGroupView)); - disposables.push(vscode.commands.registerCommand('C_Cpp.referencesViewGroupByFile', onToggleRefGroupView)); + disposables.push(vscode.commands.registerCommand('C_Cpp.referencesViewUngroupByType', onToggleRefGroupView)); disposables.push(vscode.commands.registerCommand('CppRenameView.cancel', onRenameViewCancel)); disposables.push(vscode.commands.registerCommand('CppRenameView.done', onRenameViewDone)); disposables.push(vscode.commands.registerCommand('CppRenameView.remove', onRenameViewRemove));