Merge branch 'main' into justingrote/feature/inlayHints

.config/tsaoptions.json

@@ -0,0 +1,8 @@
+{
+  "instanceUrl": "https://msazure.visualstudio.com",
+  "projectName": "One",
+  "areaPath": "One\\MGMT\\Compute\\Powershell\\Powershell",
+  "notificationAliases": [ "[email protected]", "[email protected]" ],
+  "codebaseName": "PowerShell_PowerShellEditorServices_20240313",
+  "tools": [ "CredScan", "PoliCheck", "BinSkim" ]
+}

.editorconfig

@@ -54,11 +54,11 @@ dotnet_diagnostic.CA1068.severity = error
 # CA1501: Avoid excessive inheritance
 dotnet_diagnostic.CA1501.severity = error
 # CA1502: Avoid excessive complexity
-dotnet_diagnostic.CA1502.severity = warning
+dotnet_diagnostic.CA1502.severity = silent
 # CA1505: Avoid unmaintainable code
 dotnet_diagnostic.CA1505.severity = error
 # CA1506: Avoid excessive class coupling
-dotnet_diagnostic.CA1506.severity = warning
+dotnet_diagnostic.CA1506.severity = silent
 # CA1507: Use nameof in place of string
 dotnet_diagnostic.CA1507.severity = error
 # CA1508: Avoid dead conditional code
@@ -95,22 +95,22 @@ dotnet_diagnostic.RCS1210.severity = error
 # RCS1036: Remove unnecessary blank line
 dotnet_diagnostic.RCS1036.severity = error
 # RCS1075: Avoid empty catch clause that catches System.Exception
-dotnet_diagnostic.RCS1075.severity = suggestion
+dotnet_diagnostic.RCS1075.severity = error
 # RCS1170: Use read-only auto-implemented property
 dotnet_diagnostic.RCS1170.severity = error
 
 # VSTHRD002: Avoid problematic synchronous waits
-dotnet_diagnostic.VSTHRD002.severity = suggestion
+dotnet_diagnostic.VSTHRD002.severity = error
 # VSTHRD003: Avoid awaiting foreign Tasks
-dotnet_diagnostic.VSTHRD003.severity = suggestion
+dotnet_diagnostic.VSTHRD003.severity = error
 # VSTHRD105: Avoid method overloads that assume TaskScheduler.Current
-dotnet_diagnostic.VSTHRD105.severity = suggestion
+dotnet_diagnostic.VSTHRD105.severity = error
 # VSTHRD100: Avoid async void methods
-dotnet_diagnostic.VSTHRD100.severity = suggestion
+dotnet_diagnostic.VSTHRD100.severity = error
 # VSTHRD103: Call async methods when in an async method
-dotnet_diagnostic.VSTHRD103.severity = suggestion
+dotnet_diagnostic.VSTHRD103.severity = error
 # VSTHRD110: Observe result of async calls
-dotnet_diagnostic.VSTHRD110.severity = suggestion
+dotnet_diagnostic.VSTHRD110.severity = error
 # VSTHRD114: Avoid returning a null Task
 dotnet_diagnostic.VSTHRD114.severity = error
 # VSTHRD200: Use "Async" suffix for awaitable methods

.github/release.yml

@@ -0,0 +1,16 @@
+changelog:
+  exclude:
+    labels:
+      - Ignore
+    authors:
+      - dependabot
+  categories:
+    - title: Enhancements & Features ✨
+      labels:
+        - Issue-Enhancement
+    - title: Squashed Bugs 🐛
+      labels:
+        - Issue-Bug
+    - title: Other Changes 🙏
+      labels:
+        - "*"

.github/workflows/ci-test.yml

@@ -4,9 +4,7 @@ on:
   push:
     branches: [ main ]
   pull_request:
-    # The branches below must be a subset of the branches above
     branches: [ main ]
-    paths-ignore: [ '**/*.md' ]
   merge_group:
     types: [ checks_requested ]
   schedule:
@@ -22,7 +20,6 @@ jobs:
     runs-on: ${{ matrix.os }}
     env:
       DOTNET_NOLOGO: true
-      DOTNET_CLI_TELEMETRY_OPTOUT: true
       DOTNET_GENERATE_ASPNET_CERTIFICATE: false
     steps:
       - name: Checkout repository
@@ -32,11 +29,9 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:
           cache: true
-          cache-dependency-path: '**/packages.lock.json'
-          dotnet-version: |
-            6.0.x
-            7.0.x
-            8.0.x
+          cache-dependency-path: '**/*.csproj'
+          dotnet-version: 6.0.x
+          global-json-file: "./global.json"
 
       - name: Install PSResources
         shell: pwsh
@@ -50,14 +45,20 @@ jobs:
           sparse-checkout: tools/install-powershell.ps1
           sparse-checkout-cone-mode: false
 
+      - name: Install daily
+        if: ${{ github.event_name == 'schedule' || github.event_name == 'merge_group' }}
+        continue-on-error: true
+        shell: pwsh
+        run: ./pwsh/tools/install-powershell.ps1 -Daily
+
       - name: Build and test
         shell: pwsh
-        run: Invoke-Build ${{ github.event_name == 'merge_group' && 'TestFull' || 'Test' }}
+        run: Invoke-Build -Configuration Release ${{ github.event_name == 'merge_group' && 'TestFull' || 'Test' }}
 
-      - name: Test with daily
+      - name: Test daily
         if: ${{ github.event_name == 'schedule' }}
         shell: pwsh
-        run: ./pwsh/tools/install-powershell.ps1 -Daily && Invoke-Build TestE2EDaily
+        run: Invoke-Build -Configuration Release TestE2EDaily
 
       - name: Upload build artifacts
         if: always()

.github/workflows/emacs-test.yml

@@ -6,7 +6,6 @@ on:
   pull_request:
     # The branches below must be a subset of the branches above
     branches: [ main ]
-    paths-ignore: [ '**/*.md' ]
   merge_group:
     types: [ checks_requested ]
 
@@ -16,7 +15,6 @@ jobs:
     runs-on: ubuntu-latest
     env:
       DOTNET_NOLOGO: true
-      DOTNET_CLI_TELEMETRY_OPTOUT: true
       DOTNET_GENERATE_ASPNET_CERTIFICATE: false
     steps:
       - name: Checkout repository
@@ -26,7 +24,7 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:
           cache: true
-          cache-dependency-path: '**/packages.lock.json'
+          cache-dependency-path: '**/*.csproj'
 
       - name: Install PSResources
         shell: pwsh
@@ -41,7 +39,12 @@ jobs:
         with:
           version: '28.2'
 
-      - name: Run ERT
+      - name: Run ERT with full CLI
         run: |
           emacs -Q --batch -f package-refresh-contents --eval "(package-install 'eglot)"
           emacs -Q --batch -l test/emacs-test.el -f ert-run-tests-batch-and-exit
+
+      - name: Run ERT with simple CLI
+        run: |
+          emacs -Q --batch -f package-refresh-contents --eval "(package-install 'eglot)"
+          emacs -Q --batch -l test/emacs-simple-test.el -f ert-run-tests-batch-and-exit

.github/workflows/vim-test.yml

@@ -6,7 +6,6 @@ on:
   pull_request:
     # The branches below must be a subset of the branches above
     branches: [ main ]
-    paths-ignore: [ '**/*.md' ]
   merge_group:
     types: [ checks_requested ]
 
@@ -16,7 +15,6 @@ jobs:
     runs-on: ubuntu-latest
     env:
       DOTNET_NOLOGO: true
-      DOTNET_CLI_TELEMETRY_OPTOUT: true
       DOTNET_GENERATE_ASPNET_CERTIFICATE: false
     steps:
       - name: Checkout repository
@@ -26,7 +24,7 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:
           cache: true
-          cache-dependency-path: '**/packages.lock.json'
+          cache-dependency-path: '**/*.csproj'
 
       - name: Install PSResources
         shell: pwsh
@@ -37,7 +35,10 @@ jobs:
         run: Invoke-Build Build
 
       - name: Install Vim
+        id: vim
         uses: rhysd/action-setup-vim@v1
+        with:
+          version: nightly
 
       - name: Checkout vim-ps1
         uses: actions/checkout@v4
@@ -61,7 +62,15 @@ jobs:
           repository: thinca/vim-themis
           path: vim-themis
 
-      - name: Run Themis
+      # - name: Debug if run with debugging enabled
+      #   uses: lhotari/action-upterm@v1
+
+      - name: Run Themis with full CLI
         env:
           THEMIS_VIM: ${{ steps.vim.outputs.executable }}
         run: ./vim-themis/bin/themis ./test/vim-test.vim
+
+      - name: Run Themis with simple CLI
+        env:
+          THEMIS_VIM: ${{ steps.vim.outputs.executable }}
+        run: ./vim-themis/bin/themis ./test/vim-simple-test.vim

.gitignore

@@ -1,80 +1,7 @@
-_ReSharper*
-[Bb]in
-bin-nano
-obj
-objd
-out/
-tmp/
-.tmp
-App_Data
-*.user
-*.sln.cache
-*.suo
-TestResults
-test/emacs-session.json
-[Tt]humbs.db
-buildd.*
-release/
-*.log
-*.bak
-packages
-OACRTemp/
-build_logs/
-lock
-/public/inc/bldver.*
-/public/inc/sources.ver
-/data
-/target
-.corext/gen
-registered_data.ini
-.vs/
-.dotnet/
-module/Plaster
-module/PSScriptAnalyzer
-module/PSReadLine
-docs/_site/
-docs/_repo/
-docs/metadata/
-*.zip
-
-# Generated build info file
-src/PowerShellEditorServices.Hosting/BuildInfo.cs
-
-# quickbuild.exe
-/VersionGeneratingLogs/
-QLogs
-QLocal
-QTestLogs
-
-# bad tlb/chm generators in nmake tree
-*.tlb
-*.chm
-
-# dumb silverlight
-ClientBin/
-
-# dump azure
-*.build.csdef
-csx/
-
-# Don't include ScriptAnalyzer binaries
-PowerShellEditorServices/**
-PowerShellEditorServices.NoNano/**
-
-PowerShellEditorServices.sln.ide/edb.chk
-PowerShellEditorServices.sln.ide/edbres00001.jrs
-PowerShellEditorServices.sln.ide/storage.ide
-*.jrs
-
-# Don't include PlatyPS generated MAML
-module/PowerShellEditorServices/Commands/en-US/*-help.xml
-module/PowerShellEditorServices.VSCode/en-US/*-help.xml
-
-# Don't include Third Party Notices in module folder
-module/PowerShellEditorServices/Third\ Party\ Notices.txt
-
-# Visual Studio for Mac generated file
-*.userprefs
-
-# JetBrains generated file (Rider, intelliJ)
-.idea/
+bin/
+obj/
+module/PowerShellEditorServices/NOTICE.txt
+module/PowerShellEditorServices/Commands/en-US/
+module/PSReadLine/
+module/PSScriptAnalyzer/
+TestResults/