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

Include highlights files in distribution #3370

Merged
merged 3 commits into from
Sep 21, 2023
+9 −2
Merged

Include highlights files in distribution #3370

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
8902880
Include highlights files in distribution
darrenburns Sep 21, 2023
1c8550c
Remove redundant line from pyproject
darrenburns Sep 21, 2023
c033610
Added CHANGELOG for text-area hotfix
darrenburns Sep 21, 2023
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
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).

## [0.38.1] - 2023-09-21

### Fixed

- Hotfix - added missing highlight files in build distribution https://github.com/Textualize/textual/pull/3370

## [0.38.0] - 2023-09-21

### Added
Expand Down
0 tree-sitter/highlights/bash.scm → src/textual/tree-sitter/highlights/bash.scm
View file
Open in desktop
File renamed without changes.
0 tree-sitter/highlights/css.scm → src/textual/tree-sitter/highlights/css.scm
View file
Open in desktop
File renamed without changes.
0 tree-sitter/highlights/html.scm → src/textual/tree-sitter/highlights/html.scm
View file
Open in desktop
File renamed without changes.
0 tree-sitter/highlights/json.scm → src/textual/tree-sitter/highlights/json.scm
View file
Open in desktop
File renamed without changes.
0 tree-sitter/highlights/markdown.scm → ...xtual/tree-sitter/highlights/markdown.scm
View file
Open in desktop
File renamed without changes.
0 tree-sitter/highlights/python.scm → ...textual/tree-sitter/highlights/python.scm
View file
Open in desktop
File renamed without changes.
0 tree-sitter/highlights/regex.scm → src/textual/tree-sitter/highlights/regex.scm
View file
Open in desktop
File renamed without changes.
0 tree-sitter/highlights/sql.scm → src/textual/tree-sitter/highlights/sql.scm
View file
Open in desktop
File renamed without changes.
0 tree-sitter/highlights/toml.scm → src/textual/tree-sitter/highlights/toml.scm
View file
Open in desktop
File renamed without changes.
0 tree-sitter/highlights/yaml.scm → src/textual/tree-sitter/highlights/yaml.scm
View file
Open in desktop
File renamed without changes.
5 changes: 3 additions & 2 deletions src/textual/widgets/_text_area.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@

_OPENING_BRACKETS = {"{": "}", "[": "]", "(": ")"}
_CLOSING_BRACKETS = {v: k for k, v in _OPENING_BRACKETS.items()}
_TREE_SITTER_PATH = Path(__file__) / "../../../../tree-sitter/"
_TREE_SITTER_PATH = Path(__file__).parent / "../tree-sitter/"
_HIGHLIGHTS_PATH = _TREE_SITTER_PATH / "highlights/"

StartColumn = int
Expand Down Expand Up @@ -325,7 +325,8 @@ def _get_builtin_highlight_query(language_name: str) -> str:
Path(_HIGHLIGHTS_PATH.resolve()) / f"{language_name}.scm"
)
highlight_query = highlight_query_path.read_text()
except OSError:
except OSError as e:
log.warning(f"Unable to load highlight query. {e}")
highlight_query = ""

return highlight_query
Expand Down