Skip to content

Commit

Permalink
use project names instead of full paths to make the picker easier to … (
Browse files Browse the repository at this point in the history
#2031)

* use project names instead of full paths to make the picker easier to read

* bump node version to make builds green

* fix PR build to use more recent package

* bump old setup-dotnet version

* even higher node!
  • Loading branch information
baronfel authored Aug 10, 2024
1 parent 35834a0 commit a85ea31
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 6 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Setup .NET Core
uses: actions/setup-dotnet@v2
uses: actions/setup-dotnet@v4
- uses: actions/setup-node@v3
with:
node-version: '16'
node-version: '22'
cache: 'yarn'
- name: Restore tools
run: dotnet tool restore
- run: yarn global add vsce
- run: yarn global add @vscode/vsce
- name: Run Test
run: dotnet run --project build -- -t Build
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ jobs:
with:
ref: ${{ github.head_ref }}
- name: Setup .NET Core
uses: actions/setup-dotnet@v2
uses: actions/setup-dotnet@v4
- uses: actions/setup-node@v3
with:
node-version: '16'
node-version: '22'
cache: 'yarn'
- name: Restore tools
run: dotnet tool restore
Expand Down
6 changes: 5 additions & 1 deletion src/Components/Debugger.fs
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ module LaunchJsonVersion2 =
}

module Debugger =
open Node.Api
let outputChannel = window.createOutputChannel "Ionide: Debugger"

let private logger =
Expand Down Expand Up @@ -149,7 +150,10 @@ module Debugger =
| projects ->
let picks =
projects
|> List.map (fun p -> createObj [ "data" ==> p; "label" ==> p.Project ])
|> List.map (fun p -> path.basename p.Project, p)
|> List.sortBy fst
|> List.map (fun (projectName, project) ->
createObj [ "data" ==> project; "label" ==> projectName ])
|> ResizeArray

let! proj = window.showQuickPick (unbox<U2<ResizeArray<QuickPickItem>, _>> picks)
Expand Down

0 comments on commit a85ea31

Please sign in to comment.