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

[Security Solution] Fixes multi-line diff algorithm performance in the upgrade/_review endpoint #199388

Merged
merged 8 commits into from
Nov 13, 2024
+202 −26
Merged

[Security Solution] Fixes multi-line diff algorithm performance in the upgrade/_review endpoint #199388

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
fa6e814
changes regex and adds tests
dplumlee Nov 7, 2024
91fcee2
removes ff switch
dplumlee Nov 7, 2024
26fdf6e
changes regex
dplumlee Nov 8, 2024
a2766f0
fix test
dplumlee Nov 8, 2024
9b91d1a
Merge remote-tracking branch 'upstream/main' into diff-algorithm-rege…
dplumlee Nov 11, 2024
7a3b823
updates tests
dplumlee Nov 13, 2024
7f148c7
Merge branch 'main' into diff-algorithm-regex-fix
elasticmachine Nov 13, 2024
14d46f9
Refactor the tests
banderror 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
Prev Previous commit
Next Next commit
changes regex
  • Loading branch information
@dplumlee
dplumlee committed Nov 8, 2024
commit 26fdf6e2b822cab65a2e93ddc6acbf06ffad1f7e
2 changes: 1 addition & 1 deletion ...gine/prebuilt_rules/logic/diff/calculation/algorithms/multi_line_string_diff_algorithm.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ const mergeVersions = ({
// TS does not realize that in ABC scenario, baseVersion cannot be missing
// Missing baseVersion scenarios were handled as -AA and -AB.
const mergedVersion = merge(currentVersion, baseVersion ?? '', targetVersion, {
stringSeparator: /(\n)/g, // Separates strings by new lines
stringSeparator: /(\r\n|\n|\r)/g, // Separates strings by new lines
});

return mergedVersion.conflict
Expand Down
Loading