Repository navigation
core: classify one-cell characters outside the known ranges as :other - #2399
Open
theangelperalta wants to merge 1 commit into
Open
theangelperalta wants to merge 1 commit into
theangelperalta wants to merge 1 commit into
Conversation
char-type returned :cjk for every character outside its known ranges, so Greek, Cyrillic, arrows, math symbols and box drawing were all "CJK". The SDL2 and SDL3 frontends draw :cjk with the CJK font, which draws many of these full-width in a one-cell slot, so both frontends had to re-check the width themselves (lem-project#2395, lem-project#2396). char-type now returns :cjk only for wide characters (wide-char-p) and the new type :other for the rest. Frontends that pick fonts by type can draw :other with their monospace font; ones that ignore the type, or send unknown types to a default, behave as before. - char-type is exported from lem-core/display, with docstrings for the type and the function, so frontends and tests no longer need lem-core::char-type. - SDL3 draws :other with the latin fonts (which fall back to the CJK font and the others) and drops narrow-non-cjk-char-p. - SDL2 draws :other with the latin font when it has the glyph, else with the CJK font, as before. Tests: new tests/char-type.lisp covers latin, wide (:cjk), one-cell (:other) and the unchanged types, and that every result is a char-type. The SDL font tests now take the type from char-type. lem-tests, lem-sdl2/tests and lem-sdl3/tests pass, and an SDL3 frame of Greek, Cyrillic, math, CJK and box drawing is pixel-identical to before.
Contributor
|
✅ Code Contractor Validation: PASSED 📌 Result for commit 📋 Contract Configuration: contract (Source: Repository)version: 2
trigger:
paths:
- "extensions/**"
- "frontends/**/*.lisp"
- "src/**"
- "tests/**"
- "contrib/**"
- "**/*.asd"
head_branches:
exclude:
- 'revert-*'
validation:
limits:
max_total_changed_lines: 400
max_delete_ratio: 0.5
max_files_changed: 10
severity: warning
ai:
system_prompt: |
You are a senior Common Lisp engineer reviewing code for Lem editor.
Lem is a text editor with multiple frontends (ncurses, SDL2, webview).
Focus on maintainability, consistency with existing code, and Lem-specific conventions.
rules:
# === File Structure ===
- name: defpackage_rule
prompt: |
First form must be `defpackage` or `uiop:define-package`.
Package name should match filename (e.g., `foo.lisp` → `:lem-ext/foo` or `:lem-foo`).
Extensions must use `lem-` prefix (e.g., `:lem-python-mode`).
- name: file_structure_rule
prompt: |
File organization (top to bottom):
1. defpackage
2. defvar/defparameter declarations
3. Key bindings (define-key, define-keys)
4. Class/struct definitions
5. Functions and commands
Only flag violations when elements appear OUT OF ORDER (e.g., key bindings AFTER functions, or defvar AFTER functions).
Key bindings appearing BEFORE functions is correct and expected.
Exception: In major-mode files (e.g., *-mode.lisp), flexible ordering is acceptable when it follows established patterns from similar modes (e.g., clojure-mode, python-mode).
# === Style ===
- name: loop_keywords_rule
prompt: |
Loop keywords must use colons: `(loop :for x :in list :do ...)`
NOT: `(loop for x in list do ...)`
- name: naming_conventions_rule
prompt: |
Naming conventions:
- Functions/variables: kebab-case (e.g., `find-buffer`)
- Special variables: *earmuffs* (e.g., `*global-keymap*`)
- Constants: +plus-signs+ (e.g., `+default-tab-size+`)
- Predicates: -p suffix for functions (e.g., `buffer-modified-p`)
- Do NOT use -p suffix for user-configurable variables
# === Documentation ===
- name: docstring_rule
prompt: |
Required docstrings for:
- Exported functions, methods, classes
- `define-command` (explain what the command does)
- Generic functions (`:documentation` option)
Important functions should explain "why", not just "what".
severity: warning
# === Lem-Specific ===
- name: internal_symbol_rule
prompt: |
Use exported symbols from `lem` or `lem-core` package.
Avoid `lem::internal-symbol` access.
If internal access is necessary, document why.
- name: error_handling_rule
prompt: |
- `error`: Internal/programming errors
- `editor-error`: User-facing errors (displayed in echo area)
Always use `editor-error` for messages shown to users.
- name: frontend_interface_rule
prompt: |
Frontend-specific code must use `lem-if:*` protocol.
Do not call frontend implementation directly from core.
severity: warning
# === Functional Style ===
- name: functional_style_rule
prompt: |
Prefer explicit function arguments over dynamic variables.
Avoid using `defvar` for state passed between functions.
Exception: Well-documented cases like `*current-buffer*`, constants, and configuration variables (not meant to be modified at runtime).
- name: dynamic_symbol_call_rule
prompt: |
Avoid `uiop:symbol-call`. Rethink architecture instead.
Exception: Acceptable in extensions when following patterns established in other major-mode extensions (e.g., for optional dependency loading or plugin systems).
If used, document the reason.
# === Libraries ===
- name: alexandria_usage_rule
prompt: |
Alexandria utilities allowed: `if-let`, `when-let`, `with-gensyms`, etc.
Avoid: `alexandria:curry` (use explicit lambdas)
Avoid: `alexandria-2:*` functions not yet used in codebase
# === Macros ===
- name: macro_style_rule
prompt: |
Keep macros small. For complex logic, use `call-with-*` pattern:
```lisp
(defmacro with-foo (() &body body)
`(call-with-foo (lambda () ,@body)))
```
Prefer `list` over backquote outside macros.
Exception: In major-mode files, macro patterns that are standard in other major-modes (e.g., clojure-mode, python-mode) are acceptable.📚 About Code ContractorDeclarative Code Standards That Learn and Improve Define domain-specific validation rules in YAML. Want this for your repo? |
This branch has not been deployed
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
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.
Targets
sdl3-next, the integration branch for SDL3 and text-rendering work.main, and so the nightly releases, get it whensdl3-nextis merged in.Problem
char-typereturns:cjkfor every character outside its known ranges, so Greek, Cyrillic, arrows, math symbols and box drawing are all "CJK". The SDL2 and SDL3 frontends draw:cjkwith the CJK font, which draws many of these full-width in a one-cell slot. To work around that, both frontends re-check the character's width themselves (#2376, #2395, #2396).Change
char-typereturns:cjkonly for wide characters (wide-char-p), and the new type:otherfor the rest.char-typeis exported fromlem-core/display, with docstrings for the type and the function, so frontends and tests no longer needlem-core::char-type.:otherwith the latin fonts, which fall back to the CJK font and the others.narrow-non-cjk-char-pis removed.:otherwith the latin font when it has the glyph, and with the CJK font otherwise, as before.ncurses, webview and the server don't use the type, so they're unaffected. A frontend that sends unknown types to its default font gets the old behaviour.
Testing
tests/char-type.lispcovers Latin, wide (:cjk), one-cell (:other) and the unchanged types, and checks that every result is achar-type.char-typeinstead of hard-coding:cjk.lem-tests,lem-sdl2/testsandlem-sdl3/testspass, and Lem, SDL2 and SDL3 compile with no warnings.