From a85ea31be5db3efbc91204b7d1739bd0a18b0d20 Mon Sep 17 00:00:00 2001 From: Chet Husk Date: Sat, 10 Aug 2024 13:33:49 -0500 Subject: [PATCH] =?UTF-8?q?use=20project=20names=20instead=20of=20full=20p?= =?UTF-8?q?aths=20to=20make=20the=20picker=20easier=20to=20=E2=80=A6=20(#2?= =?UTF-8?q?031)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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! --- .github/workflows/pr.yml | 6 +++--- .github/workflows/release.yml | 4 ++-- src/Components/Debugger.fs | 6 +++++- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index d0482cd5..173c754d 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -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 \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1638a928..b958838c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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 diff --git a/src/Components/Debugger.fs b/src/Components/Debugger.fs index cb944034..9a653ffc 100644 --- a/src/Components/Debugger.fs +++ b/src/Components/Debugger.fs @@ -53,6 +53,7 @@ module LaunchJsonVersion2 = } module Debugger = + open Node.Api let outputChannel = window.createOutputChannel "Ionide: Debugger" let private logger = @@ -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, _>> picks)