Merge branch 'dev/pabhoj/action_refactor' into dev/pabhoj/command_keys

microsoft · Jun 4, 2024 · 327858b · 327858b
2 parents 5a00d5f + 96d8d1f
commit 327858b
Show file tree

Hide file tree

Showing 123 changed files with 2,463 additions and 1,075 deletions.
diff --git a/.github/actions/spelling/expect/expect.txt b/.github/actions/spelling/expect/expect.txt
@@ -406,6 +406,7 @@ DECNKM
 DECNRCM
 DECOM
 decommit
+DECPCCM
 DECPCTERM
 DECPS
 DECRARA
@@ -414,6 +415,7 @@ DECREQTPARM
 DECRLM
 DECRPM
 DECRQCRA
+DECRQDE
 DECRQM
 DECRQPSR
 DECRQSS
@@ -607,6 +609,7 @@ FILTERONPASTE
 FINDCASE
 FINDDLG
 FINDDOWN
+FINDREGEX
 FINDSTRINGEXACT
 FINDUP
 FIter
@@ -2123,6 +2126,7 @@ XIn
 XManifest
 XMath
 xorg
+XPan
 XResource
 xsi
 xstyler
@@ -2142,6 +2146,7 @@ YCast
 YCENTER
 YCount
 YLimit
+YPan
 YSubstantial
 YVIRTUALSCREEN
 YWalk

diff --git a/.github/workflows/similarIssues.yml b/.github/workflows/similarIssues.yml
@@ -16,7 +16,7 @@ jobs:
  issueTitle: ${{ github.event.issue.title }}
  issueBody: ${{ github.event.issue.body }}
  repo: ${{ github.repository }}
- similaritytolerance: "0.75"
+ similaritytolerance: "0.8"
  add-comment:
  needs: getSimilarIssues
  runs-on: ubuntu-latest

diff --git a/build/pipelines/templates-v2/job-build-package-wpf.yml b/build/pipelines/templates-v2/job-build-package-wpf.yml
@@ -100,36 +100,32 @@ jobs:
  flattenFolders: true
 
  - ${{ if eq(parameters.codeSign, true) }}:
- - task: EsrpCodeSigning@5
- displayName: Submit *.nupkg to ESRP for code signing
- inputs:
- ConnectedServiceName: ${{ parameters.signingIdentity.serviceName }}
- AppRegistrationClientId: ${{ parameters.signingIdentity.appId }}
- AppRegistrationTenantId: ${{ parameters.signingIdentity.tenantId }}
- AuthAKVName: ${{ parameters.signingIdentity.akvName }}
- AuthCertName: ${{ parameters.signingIdentity.authCertName }}
- AuthSignCertName: ${{ parameters.signingIdentity.signCertName }}
- FolderPath: $(Build.ArtifactStagingDirectory)/nupkg
- Pattern: '*.nupkg'
- UseMinimatch: true
- signConfigType: inlineSignParams
- inlineOperation: >-
- [
- {
- "KeyCode": "CP-401405",
- "OperationCode": "NuGetSign",
- "Parameters": {},
- "ToolName": "sign",
- "ToolVersion": "1.0"
- },
- {
- "KeyCode": "CP-401405",
- "OperationCode": "NuGetVerify",
- "Parameters": {},
- "ToolName": "sign",
- "ToolVersion": "1.0"
- }
- ]
+ - template: steps-esrp-signing.yml
+ parameters:
+ displayName: Submit *.nupkg to ESRP for code signing
+ signingIdentity: ${{ parameters.signingIdentity }}
+ inputs:
+ FolderPath: $(Build.ArtifactStagingDirectory)/nupkg
+ Pattern: '*.nupkg'
+ UseMinimatch: true
+ signConfigType: inlineSignParams
+ inlineOperation: >-
+ [
+ {
+ "KeyCode": "CP-401405",
+ "OperationCode": "NuGetSign",
+ "Parameters": {},
+ "ToolName": "sign",
+ "ToolVersion": "1.0"
+ },
+ {
+ "KeyCode": "CP-401405",
+ "OperationCode": "NuGetVerify",
+ "Parameters": {},
+ "ToolName": "sign",
+ "ToolVersion": "1.0"
+ }
+ ]
 
  - ${{ if eq(parameters.generateSbom, true) }}:
  - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0

diff --git a/build/pipelines/templates-v2/job-build-project.yml b/build/pipelines/templates-v2/job-build-project.yml
@@ -242,18 +242,14 @@ jobs:
 
  # Code-sign everything we just put together.
  # We run the signing in Terminal.BinDir, because all of the signing batches are relative to the final architecture/configuration output folder.
- - task: EsrpCodeSigning@5
- displayName: Submit Signing Request
- inputs:
- ConnectedServiceName: ${{ parameters.signingIdentity.serviceName }}
- AppRegistrationClientId: ${{ parameters.signingIdentity.appId }}
- AppRegistrationTenantId: ${{ parameters.signingIdentity.tenantId }}
- AuthAKVName: ${{ parameters.signingIdentity.akvName }}
- AuthCertName: ${{ parameters.signingIdentity.authCertName }}
- AuthSignCertName: ${{ parameters.signingIdentity.signCertName }}
- FolderPath: '$(Terminal.BinDir)'
- signType: batchSigning
- batchSignPolicyFile: '$(Build.SourcesDirectory)/ESRPSigningConfig.json'
+ - template: steps-esrp-signing.yml
+ parameters:
+ displayName: Submit Signing Request
+ signingIdentity: ${{ parameters.signingIdentity }}
+ inputs:
+ FolderPath: '$(Terminal.BinDir)'
+ signType: batchSigning
+ batchSignPolicyFile: '$(Build.SourcesDirectory)/ESRPSigningConfig.json'
 
  # We only need to re-pack the MSIX if we actually signed, so this can stay in the codeSign conditional
  - ${{ if or(parameters.buildTerminal, parameters.buildEverything) }}:

diff --git a/build/pipelines/templates-v2/job-merge-msix-into-bundle.yml b/build/pipelines/templates-v2/job-merge-msix-into-bundle.yml
@@ -97,45 +97,41 @@ jobs:
  displayName: Create msixbundle
 
  - ${{ if eq(parameters.codeSign, true) }}:
- - task: EsrpCodeSigning@5
- displayName: Submit *.msixbundle to ESRP for code signing
- inputs:
- ConnectedServiceName: ${{ parameters.signingIdentity.serviceName }}
- AppRegistrationClientId: ${{ parameters.signingIdentity.appId }}
- AppRegistrationTenantId: ${{ parameters.signingIdentity.tenantId }}
- AuthAKVName: ${{ parameters.signingIdentity.akvName }}
- AuthCertName: ${{ parameters.signingIdentity.authCertName }}
- AuthSignCertName: ${{ parameters.signingIdentity.signCertName }}
- FolderPath: $(System.ArtifactsDirectory)\bundle
- Pattern: $(BundleStemName)*.msixbundle
- UseMinimatch: true
- signConfigType: inlineSignParams
- inlineOperation: >-
- [
- {
- "KeyCode": "Dynamic",
- "CertTemplateName": "WINMSAPP1ST",
- "CertSubjectName": "CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US",
- "OperationCode": "SigntoolSign",
- "Parameters": {
- "OpusName": "Microsoft",
- "OpusInfo": "http://www.microsoft.com",
- "FileDigest": "/fd \"SHA256\"",
- "TimeStamp": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
- },
- "ToolName": "sign",
- "ToolVersion": "1.0"
- },
- {
- "KeyCode": "Dynamic",
- "CertTemplateName": "WINMSAPP1ST",
- "CertSubjectName": "CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US",
- "OperationCode": "SigntoolVerify",
- "Parameters": {},
- "ToolName": "sign",
- "ToolVersion": "1.0"
- }
- ]
+ - template: steps-esrp-signing.yml
+ parameters:
+ displayName: Submit *.msixbundle to ESRP for code signing
+ signingIdentity: ${{ parameters.signingIdentity }}
+ inputs:
+ FolderPath: $(System.ArtifactsDirectory)\bundle
+ Pattern: $(BundleStemName)*.msixbundle
+ UseMinimatch: true
+ signConfigType: inlineSignParams
+ inlineOperation: >-
+ [
+ {
+ "KeyCode": "Dynamic",
+ "CertTemplateName": "WINMSAPP1ST",
+ "CertSubjectName": "CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US",
+ "OperationCode": "SigntoolSign",
+ "Parameters": {
+ "OpusName": "Microsoft",
+ "OpusInfo": "http://www.microsoft.com",
+ "FileDigest": "/fd \"SHA256\"",
+ "TimeStamp": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
+ },
+ "ToolName": "sign",
+ "ToolVersion": "1.0"
+ },
+ {
+ "KeyCode": "Dynamic",
+ "CertTemplateName": "WINMSAPP1ST",
+ "CertSubjectName": "CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US",
+ "OperationCode": "SigntoolVerify",
+ "Parameters": {},
+ "ToolName": "sign",
+ "ToolVersion": "1.0"
+ }
+ ]
 
  - ${{ if eq(parameters.generateSbom, true) }}:
  - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0

diff --git a/build/pipelines/templates-v2/job-package-conpty.yml b/build/pipelines/templates-v2/job-package-conpty.yml
@@ -85,36 +85,32 @@ jobs:
  versionEnvVar: XES_PACKAGEVERSIONNUMBER
 
  - ${{ if eq(parameters.codeSign, true) }}:
- - task: EsrpCodeSigning@5
- displayName: Submit *.nupkg to ESRP for code signing
- inputs:
- ConnectedServiceName: ${{ parameters.signingIdentity.serviceName }}
- AppRegistrationClientId: ${{ parameters.signingIdentity.appId }}
- AppRegistrationTenantId: ${{ parameters.signingIdentity.tenantId }}
- AuthAKVName: ${{ parameters.signingIdentity.akvName }}
- AuthCertName: ${{ parameters.signingIdentity.authCertName }}
- AuthSignCertName: ${{ parameters.signingIdentity.signCertName }}
- FolderPath: $(Build.ArtifactStagingDirectory)/nupkg
- Pattern: '*.nupkg'
- UseMinimatch: true
- signConfigType: inlineSignParams
- inlineOperation: >-
- [
- {
- "KeyCode": "CP-401405",
- "OperationCode": "NuGetSign",
- "Parameters": {},
- "ToolName": "sign",
- "ToolVersion": "1.0"
- },
- {
- "KeyCode": "CP-401405",
- "OperationCode": "NuGetVerify",
- "Parameters": {},
- "ToolName": "sign",
- "ToolVersion": "1.0"
- }
- ]
+ - template: steps-esrp-signing.yml
+ parameters:
+ displayName: Submit *.nupkg to ESRP for code signing
+ signingIdentity: ${{ parameters.signingIdentity }}
+ inputs:
+ FolderPath: $(Build.ArtifactStagingDirectory)/nupkg
+ Pattern: '*.nupkg'
+ UseMinimatch: true
+ signConfigType: inlineSignParams
+ inlineOperation: >-
+ [
+ {
+ "KeyCode": "CP-401405",
+ "OperationCode": "NuGetSign",
+ "Parameters": {},
+ "ToolName": "sign",
+ "ToolVersion": "1.0"
+ },
+ {
+ "KeyCode": "CP-401405",
+ "OperationCode": "NuGetVerify",
+ "Parameters": {},
+ "ToolName": "sign",
+ "ToolVersion": "1.0"
+ }
+ ]
 
  - ${{ if eq(parameters.generateSbom, true) }}:
  - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0

diff --git a/build/pipelines/templates-v2/steps-esrp-signing.yml b/build/pipelines/templates-v2/steps-esrp-signing.yml
@@ -0,0 +1,22 @@
+parameters:
+ - name: displayName
+ type: string
+ default: ESRP Code Signing
+ - name: inputs
+ type: object
+ default: {}
+ - name: signingIdentity
+ type: object
+ default: {}
+
+steps:
+ - task: EsrpCodeSigning@5
+ displayName: ${{ parameters.displayName }}
+ inputs:
+ ConnectedServiceName: ${{ parameters.signingIdentity.serviceName }}
+ AppRegistrationClientId: ${{ parameters.signingIdentity.appId }}
+ AppRegistrationTenantId: ${{ parameters.signingIdentity.tenantId }}
+ AuthAKVName: ${{ parameters.signingIdentity.akvName }}
+ AuthCertName: ${{ parameters.signingIdentity.authCertName }}
+ AuthSignCertName: ${{ parameters.signingIdentity.signCertName }}
+ ${{ insert }}: ${{ parameters.inputs }}
diff --git a/src/buffer/out/search.cpp b/src/buffer/out/search.cpp
@@ -8,24 +8,26 @@
 
 using namespace Microsoft::Console::Types;
 
-bool Search::IsStale(const Microsoft::Console::Render::IRenderData& renderData, const std::wstring_view& needle, bool caseInsensitive) const noexcept
+bool Search::IsStale(const Microsoft::Console::Render::IRenderData& renderData, const std::wstring_view& needle, SearchFlag flags) const noexcept
 {
  return _renderData != &renderData ||
  _needle != needle ||
- _caseInsensitive != caseInsensitive ||
+ _flags != flags ||
  _lastMutationId != renderData.GetTextBuffer().GetLastMutationId();
 }
 
-bool Search::Reset(Microsoft::Console::Render::IRenderData& renderData, const std::wstring_view& needle, bool caseInsensitive, bool reverse)
+bool Search::Reset(Microsoft::Console::Render::IRenderData& renderData, const std::wstring_view& needle, SearchFlag flags, bool reverse)
 {
  const auto& textBuffer = renderData.GetTextBuffer();
 
  _renderData = &renderData;
  _needle = needle;
- _caseInsensitive = caseInsensitive;
+ _flags = flags;
  _lastMutationId = textBuffer.GetLastMutationId();
 
- _results = textBuffer.SearchText(needle, caseInsensitive);
+ auto result = textBuffer.SearchText(needle, _flags);
+ _ok = result.has_value();
+ _results = std::move(result).value_or(std::vector<til::point_span>{});
  _index = reverse ? gsl::narrow_cast<ptrdiff_t>(_results.size()) - 1 : 0;
  _step = reverse ? -1 : 1;
  return true;
@@ -144,3 +146,8 @@ ptrdiff_t Search::CurrentMatch() const noexcept
 {
  return _index;
 }
+
+bool Search::IsOk() const noexcept
+{
+ return _ok;
+}
diff --git a/src/buffer/out/search.h b/src/buffer/out/search.h
@@ -20,13 +20,23 @@ Revision History:
 #include "textBuffer.hpp"
 #include "../renderer/inc/IRenderData.hpp"
 
+enum class SearchFlag : unsigned int
+{
+ None = 0,
+
+ CaseInsensitive = 1 << 0,
+ RegularExpression = 1 << 1,
+};
+
+DEFINE_ENUM_FLAG_OPERATORS(SearchFlag);
+
 class Search final
 {
 public:
  Search() = default;
 
- bool IsStale(const Microsoft::Console::Render::IRenderData& renderData, const std::wstring_view& needle, bool caseInsensitive) const noexcept;
- bool Reset(Microsoft::Console::Render::IRenderData& renderData, const std::wstring_view& needle, bool caseInsensitive, bool reverse);
+ bool IsStale(const Microsoft::Console::Render::IRenderData& renderData, const std::wstring_view& needle, SearchFlag flags) const noexcept;
+ bool Reset(Microsoft::Console::Render::IRenderData& renderData, const std::wstring_view& needle, SearchFlag flags, bool reverse);
 
  void MoveToCurrentSelection();
  void MoveToPoint(til::point anchor) noexcept;
@@ -39,14 +49,16 @@ class Search final
  const std::vector<til::point_span>& Results() const noexcept;
  std::vector<til::point_span>&& ExtractResults() noexcept;
  ptrdiff_t CurrentMatch() const noexcept;
+ bool IsOk() const noexcept;
 
 private:
  // _renderData is a pointer so that Search() is constexpr default constructable.
  Microsoft::Console::Render::IRenderData* _renderData = nullptr;
  std::wstring _needle;
- bool _caseInsensitive = false;
+ SearchFlag _flags{};
  uint64_t _lastMutationId = 0;
 
+ bool _ok{ false };
  std::vector<til::point_span> _results;
  ptrdiff_t _index = 0;
  ptrdiff_t _step = 0;