Skip to content

Commit 07d4316

Browse files
authored
Merge pull request #136 from lukester1975/refactor-target-type-ui
Instead of target type in ui, use a tool tip.
2 parents 72d69ee + 6f0d210 commit 07d4316

File tree

4 files changed

+22
-2
lines changed

4 files changed

+22
-2
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
- Automatically configure Intellisense to use compile_commands.json generated
88
by Meson.
9+
- Meson `tasks.json` entries specifying `target` will now need to include the target's type. E.g. `"target": "relative/path/to/targetname:shared_library"`.
910

1011
## 1.8.1
1112

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@
187187
"properties": {
188188
"target": {
189189
"type": "string",
190-
"description": "The Meson target to... target",
190+
"description": "The Meson target. The full name, including path and type, is mandatory (e.g. relative/path/to/targetname:shared_library)",
191191
"default": "all",
192192
"dependencies": {
193193
"mode": {

res/icon-shared-library.svg

Lines changed: 16 additions & 0 deletions
Loading

src/treeview/nodes/targets.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,8 @@ export class TargetNode extends BaseNode {
103103
async getTreeItem() {
104104
const item = super.getTreeItem() as vscode.TreeItem;
105105

106-
item.label = `${this.target.name} ${this.target.type}`;
106+
item.label = this.target.name;
107+
item.tooltip = this.target.type;
107108
item.iconPath = extensionRelative(this.getIconPath());
108109
item.collapsibleState = vscode.TreeItemCollapsibleState.Collapsed;
109110
item.contextValue = "meson-target";
@@ -129,6 +130,8 @@ export class TargetNode extends BaseNode {
129130
return "res/icon-run-java.svg";
130131

131132
case "shared library":
133+
return "res/icon-shared-library.svg";
134+
132135
case "static library":
133136
case "shared module":
134137
return "res/icon-library.svg";

0 commit comments

Comments
 (0)