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.

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

Fake target support -> 4 0 #1137

Merged
merged 14 commits into from
Jun 22, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 9 additions & 3 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@
"tasks": [
{
"command": "${workspaceRoot}/build.sh",
"type": "shell",
"windows": {
"command": "${workspaceRoot}/build.cmd"
"command": "${workspaceRoot}/build.cmd",
"type": "process" // some people have bash as default in windows
},
"label": "Build",
"args": [
Expand All @@ -21,8 +23,10 @@
},
{
"command": "${workspaceRoot}/build.sh",
"type": "shell",
"windows": {
"command": "${workspaceRoot}/build.cmd"
"command": "${workspaceRoot}/build.cmd",
"type": "process" // some people have bash as default in windows
},
"label": "Full Build",
"args": [
Expand All @@ -32,8 +36,10 @@
},
{
"command": "${workspaceRoot}/build.sh",
"type": "shell",
"windows": {
"command": "${workspaceRoot}/build.cmd"
"command": "${workspaceRoot}/build.cmd",
"type": "process" // some people have bash as default in windows
},
"label": "Watch",
"args": [
Expand Down
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ if test "$OS" = "Windows_NT"
then
# use .Net

./paket.exe restore
.paket/paket.exe restore
exit_code=$?
if [ $exit_code -ne 0 ]; then
exit $exit_code
Expand Down
8 changes: 4 additions & 4 deletions paket.lock
Original file line number Diff line number Diff line change
Expand Up @@ -632,10 +632,10 @@ GIT
(4b0866224a344c09f06254c0f70a78582530792c)
GITHUB
remote: ionide/ionide-vscode-helpers
src/Fable.Import.Showdown.fs (2c171bb4ccab0db3b1704389cdc736f9a23682d9)
src/Fable.Import.VSCode.fs (2c171bb4ccab0db3b1704389cdc736f9a23682d9)
src/Fable.Import.VSCode.LanguageServer.fs (2c171bb4ccab0db3b1704389cdc736f9a23682d9)
src/Helpers.fs (2c171bb4ccab0db3b1704389cdc736f9a23682d9)
src/Fable.Import.Showdown.fs (be3ff3c7c454525fee4bb9c36a3811e403a19f0b)
src/Fable.Import.VSCode.fs (be3ff3c7c454525fee4bb9c36a3811e403a19f0b)
src/Fable.Import.VSCode.LanguageServer.fs (be3ff3c7c454525fee4bb9c36a3811e403a19f0b)
src/Helpers.fs (be3ff3c7c454525fee4bb9c36a3811e403a19f0b)
GROUP build
NUGET
remote: https://www.nuget.org/api/v2
Expand Down
26 changes: 26 additions & 0 deletions release/images/error-inverse.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 25 additions & 0 deletions release/images/error.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 15 additions & 0 deletions release/images/warning-inverse.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 15 additions & 0 deletions release/images/warning.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
115 changes: 114 additions & 1 deletion release/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -466,6 +466,46 @@
"light": "./images/lock-open-solid-light.svg",
"dark": "./images/lock-open-solid.svg"
}
},
{
"command": "fake.targetsOutline.reloadTargets",
"title": "Reload targets from script",
"icon": {
"light": "./images/refresh-light.svg",
"dark": "./images/refresh-dark.svg"
}
},
{
"command": "fake.targetsOutline.runTarget",
"title": "Run",
"icon": {
"light": "./images/run-mono-light.svg",
"dark": "./images/run-mono-dark.svg"
}
},
{
"command": "fake.targetsOutline.debugTarget",
"title": "Debug",
"icon": {
"light": "./images/debug-mono-light.svg",
"dark": "./images/debug-mono-dark.svg"
}
},
{
"command": "fake.targetsOutline.runSingleTarget",
"title": "Run Single",
"icon": {
"light": "./images/run-mono-light.svg",
"dark": "./images/run-mono-dark.svg"
}
},
{
"command": "fake.targetsOutline.debugSingleTarget",
"title": "Debug Single",
"icon": {
"light": "./images/debug-mono-light.svg",
"dark": "./images/debug-mono-dark.svg"
}
}
],
"viewsContainers": {
Expand All @@ -484,13 +524,23 @@
"id": "ionide.projectExplorer",
"name": "F# Solution Explorer",
"when": "fsharp.project.any && fsharp.showProjectExplorerInExplorerActivity"
},
{
"id": "fake.targetsOutline",
"name": "FAKE Targets Outline",
"when": "fake.targetsOutline.show && fake.targetsOutline.showInExplorerActivity"
}
],
"ionide-fsharp": [
{
"id": "ionide.projectExplorerInActivity",
"name": "Solution Explorer",
"when": "fsharp.project.any && fsharp.showProjectExplorerInFsharpActivity"
},
{
"id": "fake.targetsOutlineInActivity",
"name": "FAKE Targets Outline",
"when": "fake.targetsOutline.show && fake.targetsOutline.showInFsharpActivity"
}
]
},
Expand Down Expand Up @@ -675,6 +725,26 @@
{
"command": "fsharp.showDocumentation",
"when": "false"
},
{
"command": "fake.targetsOutline.reloadTargets",
"when": "false"
},
{
"command": "fake.targetsOutline.runTarget",
"when": "false"
},
{
"command": "fake.targetsOutline.debugTarget",
"when": "false"
},
{
"command": "fake.targetsOutline.runSingleTarget",
"when": "false"
},
{
"command": "fake.targetsOutline.debugSingleTarget",
"when": "false"
}
],
"view/title": [
Expand Down Expand Up @@ -761,6 +831,16 @@
"command": "fsharp.explorer.clearCache",
"group": "modification@5",
"when": "view == ionide.projectExplorerInActivity"
},
{
"command": "fake.targetsOutline.reloadTargets",
"group": "navigation@1",
"when": "view == fake.targetsOutline"
},
{
"command": "fake.targetsOutline.reloadTargets",
"group": "navigation@1",
"when": "view == fake.targetsOutlineInActivity"
}
],
"view/item/context": [
Expand Down Expand Up @@ -1021,6 +1101,24 @@
"command": "fsharp.explorer.project.setDefault",
"when": "viewItem == ionide.projectExplorer.projectExe",
"group": "1_run@3"
},
{
"command": "fake.targetsOutline.runTarget",
"when": "view =~ /(fake.targetsOutline|fake.targetsOutlineInActivity)/ && viewItem == fake.targetsOutline.target",
"group": "inline"
},
{
"command": "fake.targetsOutline.debugTarget",
"when": "view =~ /(fake.targetsOutline|fake.targetsOutlineInActivity)/ && viewItem == fake.targetsOutline.target",
"group": "inline"
},
{
"command": "fake.targetsOutline.runSingleTarget",
"when": "view =~ /(fake.targetsOutline|fake.targetsOutlineInActivity)/ && viewItem == fake.targetsOutline.target"
},
{
"command": "fake.targetsOutline.debugSingleTarget",
"when": "view =~ /(fake.targetsOutline|fake.targetsOutlineInActivity)/ && viewItem == fake.targetsOutline.target"
}
],
"editor/context": [
Expand Down Expand Up @@ -1288,7 +1386,6 @@
"description": "The prefix displayed before the signature",
"default": " // "
},

"FSharp.disableFailedProjectNotifications": {
"type": "boolean",
"default": false,
Expand Down Expand Up @@ -1388,6 +1485,22 @@
"type": "boolean",
"default": false,
"description": "Logs additional information to F# output channel. Requires restart."
},
"FAKE.targetsOutline": {
"type": "boolean",
"default": true,
"description": "Enables the Targets Outline tree view.",
"scope": "resource"
},
"FAKE.showTargetsOutlineIn": {
"type": "string",
"default": "explorer",
"description": "Set the activity (left bar) where the FAKE targets outline view will be displayed.\nRequires restart.",
"enum": [
"explorer",
"fsharp"
],
"scope": "application"
}
}
},
Expand Down
Loading