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.

Sign up for GitHub

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

Fix #5086 - Invalid JSON in the snippets file #5087

Merged
merged 9 commits into from
Nov 13, 2024
Merged

Fix #5086 - Invalid JSON in the snippets file #5087

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9b18300
Fixed JSON
o-l-a-v Nov 8, 2024
338b9d0
Added test for making sure all JSON files are valid JSON
o-l-a-v Nov 8, 2024
bac4de0
Run in correct dir
o-l-a-v Nov 8, 2024
f54c79c
Simplify title of the new step
o-l-a-v Nov 13, 2024
608bbca
Fix path double nesting
o-l-a-v Nov 13, 2024
9290471
Add spaces after commas
o-l-a-v Nov 13, 2024
5c1997f
Use $PWD instead of '.\' for current dir 🐧
o-l-a-v Nov 13, 2024
5e9b7f1
Only test the snippets JSON file
o-l-a-v Nov 13, 2024
ac2608a
Oops, typo
o-l-a-v Nov 13, 2024
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
13 changes: 9 additions & 4 deletions .github/workflows/ci-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@ name: CI Tests

on:
push:
branches: [ main ]
branches: [main]
pull_request:
# The branches below must be a subset of the branches above
branches: [ main ]
branches: [main]
merge_group:
types: [ checks_requested ]
types: [checks_requested]

jobs:
ci:
name: node
strategy:
matrix:
os: [ windows-latest, macos-latest, ubuntu-latest ]
os: [windows-latest, macos-latest, ubuntu-latest]
runs-on: ${{ matrix.os }}
env:
DOTNET_NOLOGO: true
Expand All @@ -33,6 +33,11 @@ jobs:
with:
path: vscode-powershell

- name: Validate snippets JSON file
shell: pwsh
run: $null = ConvertFrom-Json -InputObject (Get-Content -Raw -Path './snippets/PowerShell.json')
working-directory: vscode-powershell
o-l-a-v marked this conversation as resolved.
Show resolved Hide resolved

- name: Install dotnet
uses: actions/setup-dotnet@v4
with:
Expand Down
33 changes: 16 additions & 17 deletions snippets/PowerShell.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,24 +162,23 @@
]
},
"Foreach with Progress": {
"prefix": "foreach-progress",
"prefix": "foreach-progress",
"description": "Insert a foreach loop with Write-Progress initialized",
"body": [
\\$progPercent = \"{0:n2}\" -f ([math]::round(\\$i/\\$array.count,4) * 100)",

Write-Progress -Activity \"${3:activityName}\" -Status \"\\$i of \\$array.count - \\$progPercent% Complete:\" -PercentComplete \\$progPercent",
"\\$i = 1",
"foreach ($${2:item} in $${1:array}) {",
" \\$progPercent = \"{0:n2}\" -f ([math]::round(\\$i/\\$total,4) * 100)",
" Write-Progress -Activity \"${3:activityName}\" -Status \"\\$i of \\$total - \\$progPercent% Complete:\" -PercentComplete \\$progPercent",
" # Insert Code Here",
" ${0}",
" ",
" \\$i++",
"}",
""
]
},
"body": [
"\\$progPercent = \"{0:n2}\" -f ([math]::round(\\$i/\\$array.count,4) * 100)",
"Write-Progress -Activity \"${3:activityName}\" -Status \"\\$i of \\$array.count - \\$progPercent% Complete:\" -PercentComplete \\$progPercent",
"\\$i = 1",
"foreach ($${2:item} in $${1:array}) {",
" \\$progPercent = \"{0:n2}\" -f ([math]::round(\\$i/\\$total,4) * 100)",
" Write-Progress -Activity \"${3:activityName}\" -Status \"\\$i of \\$total - \\$progPercent% Complete:\" -PercentComplete \\$progPercent",
" # Insert Code Here",
" ${0}",
" ",
" \\$i++",
"}",
""
]
},
"ForEach-Object -Parallel": {
"prefix": "foreach-parallel",
"description": "[PS 7+] Process multiple objects in parallel using runspaces. This has some limitations compared to a regular ForEach-Object. More: Get-Help ForEach-Object",
Expand Down