ref(utils): reorder regexpa and add tests #7505
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
timfish
approved these changes
Mar 17, 2023
JonasBa
commented
Mar 17, 2023
Comment on lines
+130
to
+176
| if (lineMatch) { | ||
| let object: string | undefined; | ||
| let method: string | undefined; | ||
| let functionName: string | undefined; | ||
| let typeName: string | undefined; | ||
| let methodName: string | undefined; | ||
|
|
||
| if (lineMatch[1]) { | ||
| functionName = lineMatch[1]; | ||
| if (lineMatch[1]) { | ||
| functionName = lineMatch[1]; | ||
|
|
||
| let methodStart = functionName.lastIndexOf('.'); | ||
| if (functionName[methodStart - 1] === '.') { | ||
| methodStart--; | ||
| } | ||
| let methodStart = functionName.lastIndexOf('.'); | ||
| if (functionName[methodStart - 1] === '.') { | ||
| methodStart--; | ||
| } | ||
|
|
||
| if (methodStart > 0) { | ||
| object = functionName.slice(0, methodStart); | ||
| method = functionName.slice(methodStart + 1); | ||
| const objectEnd = object.indexOf('.Module'); | ||
| if (objectEnd > 0) { | ||
| functionName = functionName.slice(objectEnd + 1); | ||
| object = object.slice(0, objectEnd); | ||
| if (methodStart > 0) { | ||
| object = functionName.slice(0, methodStart); | ||
| method = functionName.slice(methodStart + 1); | ||
| const objectEnd = object.indexOf('.Module'); | ||
| if (objectEnd > 0) { | ||
| functionName = functionName.slice(objectEnd + 1); | ||
| object = object.slice(0, objectEnd); | ||
| } | ||
| } | ||
| typeName = undefined; | ||
| } | ||
| typeName = undefined; | ||
| } | ||
|
|
||
| if (method) { | ||
| typeName = object; | ||
| methodName = method; | ||
| } | ||
| if (method) { | ||
| typeName = object; | ||
| methodName = method; | ||
| } | ||
|
|
||
| if (method === '<anonymous>') { | ||
| methodName = undefined; | ||
| functionName = undefined; | ||
| } | ||
|
|
||
| if (method === '<anonymous>') { | ||
| methodName = undefined; | ||
| functionName = undefined; | ||
| if (functionName === undefined) { | ||
| methodName = methodName || '<anonymous>'; | ||
| functionName = typeName ? `${typeName}.${methodName}` : methodName; | ||
| } | ||
|
|
||
| let filename = lineMatch[2] && lineMatch[2].startsWith('file://') ? lineMatch[2].slice(7) : lineMatch[2]; | ||
| const isNative = lineMatch[5] === 'native'; | ||
|
|
||
| if (!filename && lineMatch[5] && !isNative) { | ||
| filename = lineMatch[5]; |
Member
Author
There was a problem hiding this comment.
This is an indentation change and order of operations is different - we first run the FULL_MATCH regexp which we expect to match most often and then the fallback
mydea
approved these changes
Mar 20, 2023
AbhiPrasad
approved these changes
Mar 20, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Reorder the regexp so that we prioritize the one more likely to match. Also adds tests and covered an edge case where input like
'at myFunction (/path/to/file.js)';would have undefined paths.I have generated the tests with the help of chatgpt and manually checked all of them - it got a few of them wrong or was testing impossible cases, but it did find that one edge case apparently