Multiple tags files (and other improvements) #48
Merged
Conversation
This file contains 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
|
Just as an option to consider if you haven't, it seems like it might be possible to just not use PCRE syntax in the regex? I think Just a thought, not well researched. |
|
Thanks, @michaelkitson! I'll try that. |
azuzunaga
reviewed
Mar 12, 2024
src/config.ts
Outdated
Comment on lines
298
to
319
| function languageMerge(mask: LanguageConfig, base: LanguageConfig): LanguageConfig { | ||
| return { | ||
| languageId: mask.languageId, | ||
| serverCommand: mask.serverCommand || base.serverCommand, | ||
| formatCommand: mask.formatCommand || base.formatCommand, | ||
| apiSearchUrl: mask.apiSearchUrl || base.apiSearchUrl, | ||
| tags: arrayMerge(mask.tags || [], base.tags || [], tag => tag.file, tagMerge), | ||
| annotations: arrayMerge(mask.annotations || [], base.annotations || [], ann => ann.file, (mask, base) => mask) | ||
| } | ||
| } | ||
|
|
||
| function tagMerge(mask: TagsConfig, base: TagsConfig): TagsConfig { | ||
| return { | ||
| file: mask.file, | ||
| grepPath: mask.grepPath, | ||
| initTagsCommand: mask.initTagsCommand || base.initTagsCommand, | ||
| refreshTagsCommand: mask.refreshTagsCommand || base.refreshTagsCommand, | ||
| completionsProvider: mask.completionsProvider || base.completionsProvider, | ||
| definitionsProvider: mask.definitionsProvider || base.definitionsProvider, | ||
| importsProvider: mask.importsProvider || base.importsProvider | ||
| } | ||
| } |
azuzunaga
reviewed
Mar 12, 2024
|
@michaelkitson I'm going to go with requiring GNU Grep, because I spent too much time pulling my hair out trying to figure out a CLI invocation that worked for both GNU Grep and BSD Grep -_- |
friedbrice
changed the title
azuzunaga
approved these changes
Mar 12, 2024
|
A PR to release these changes has been created, bumping the version from 2.6.0 to 3.0.0. |
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.
Co-requisite with https://github.com/MercuryTechnologies/mercury-web-backend/pull/26568
greppath.