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

Multiple tags files (and other improvements) #48

Merged
merged 3 commits into from
Mar 13, 2024
Merged

Multiple tags files (and other improvements) #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6292997
Configure grep path
friedbrice Mar 12, 2024
168b35c
support multiple tags files and config merge
friedbrice Mar 12, 2024
5db6ae2
whelp
friedbrice Mar 12, 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
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@ All notable changes to the "alloglot" extension will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
This project adhere's to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [unreleased]

- Support configurable path to `grep`.
- Support multiple tags configs. `alloglot.tags` must now be an array of `TagsConfig`.
- Support merging workspace config with fallback config.
- Some error handling and reporting for configs.

## [2.6.0]

- Add `deactivateCommand` to `TConfig` to run on extension `deactivate()`
Expand Down
173 changes: 83 additions & 90 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,23 +51,27 @@
"properties": {
"alloglot.activateCommand": {
"type": "string",
"description": "A shell command to run on activation. The command will run asynchronously. It will be killed (if it's still running) on deactivation.",
"default": null
"description": "A shell command to run on activation. The command will run asynchronously. It will be killed (if it's still running) on deactivation."
},
"alloglot.deactivateCommand": {
"type": "string",
"description": "A shell command to run on deactivation.",
"default": null
"description": "A shell command to run on deactivation."
},
"alloglot.verboseOutput": {
"type": "boolean",
"description": "If `true`, Alloglot will log more output.",
"default": null
"description": "If `true`, Alloglot will log more output."
},
"alloglot.mergeConfigs": {
"type": "boolean",
"description": "If `true`, Alloglot will merge `.vscode/alloglot.json` into its config."
},
"alloglot.grepPath": {
"type": "string",
"description": "Path to GNU Grep. Parsing tags files depends on GNU Grep. (BSD Grep is not supported.)"
},
"alloglot.languages": {
"type": "array",
"description": "An array of language configurations. See README.md for schema.",
"default": null,
"items": {
"type": "object",
"required": [
Expand All @@ -78,75 +82,74 @@
"type": "string"
},
"serverCommand": {
"type": "string",
"default": null
"type": "string"
},
"formatCommand": {
"type": "string",
"default": null
"type": "string"
},
"apiSearchUrl": {
"type": "string",
"default": null
"type": "string"
},
"tags": {
"type": "object",
"default": null,
"required": [
"file"
],
"properties": {
"file": {
"type": "string"
},
"initTagsCommand": {
"type": "string"
},
"refreshTagsCommand": {
"type": "string"
},
"completionsProvider": {
"type": "boolean"
},
"definitionsProvider": {
"type": "boolean"
},
"importsProvider": {
"type": "object",
"required": [
"importLinePattern",
"matchFromFilepath",
"renderModuleName"
],
"properties": {
"importLinePattern": {
"type": "string"
},
"matchFromFilepath": {
"type": "string"
},
"renderModuleName": {
"type": "array",
"items": {
"type": "object",
"required": [
"tag"
],
"properties": {
"tag": {
"type": "string"
},
"from": {
"type": "string"
},
"to": {
"type": "string"
},
"on": {
"type": "string"
},
"with": {
"type": "string"
"type": "array",
"items": {
"type": "object",
"required": [
"file"
],
"properties": {
"file": {
"type": "string"
},
"initTagsCommand": {
"type": "string"
},
"refreshTagsCommand": {
"type": "string"
},
"completionsProvider": {
"type": "boolean"
},
"definitionsProvider": {
"type": "boolean"
},
"importsProvider": {
"type": "object",
"required": [
"importLinePattern",
"matchFromFilepath",
"renderModuleName"
],
"properties": {
"importLinePattern": {
"type": "string"
},
"matchFromFilepath": {
"type": "string"
},
"renderModuleName": {
"type": "array",
"items": {
"type": "object",
"required": [
"tag"
],
"properties": {
"tag": {
"type": "string"
},
"from": {
"type": "string"
},
"to": {
"type": "string"
},
"on": {
"type": "string"
},
"with": {
"type": "string"
}
}
}
}
Expand All @@ -155,9 +158,8 @@
}
}
},
"annotationsFiles": {
"annotations": {
"type": "array",
"default": null,
"items": {
"type": "object",
"required": [
Expand Down Expand Up @@ -188,64 +190,55 @@
"type": "array",
"items": {
"type": "string"
},
"default": null
}
},
"startLine": {
"type": "array",
"items": {
"type": "string"
},
"default": null
}
},
"startColumn": {
"type": "array",
"items": {
"type": "string"
},
"default": null
}
},
"endLine": {
"type": "array",
"items": {
"type": "string"
},
"default": null
}
},
"endColumn": {
"type": "array",
"items": {
"type": "string"
},
"default": null
}
},
"source": {
"type": "array",
"items": {
"type": "string"
},
"default": null
}
},
"severity": {
"type": "array",
"items": {
"type": "string"
},
"default": null
}
},
"replacements": {
"type": "array",
"items": {
"type": "string"
},
"default": null
}
},
"referenceCode": {
"type": "array",
"items": {
"type": "string"
},
"default": null
}
}
}
}
Expand Down
Loading
Loading