From d5cb5f45408d32cba7f204a180fcbe90d01f5f4fa18eef5160b7b849469230fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Mon, 20 Sep 2021 13:07:56 +0000 Subject: [PATCH] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-skylighting revision:30, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-skylighting?expand=0&rev=76 --- ghc-skylighting.changes | 41 +++++++++++++++++++++++++++++++++++++++++ ghc-skylighting.spec | 2 +- skylighting-0.11.tar.gz | 3 --- skylighting-0.12.tar.gz | 3 +++ 4 files changed, 45 insertions(+), 4 deletions(-) delete mode 100644 skylighting-0.11.tar.gz create mode 100644 skylighting-0.12.tar.gz diff --git a/ghc-skylighting.changes b/ghc-skylighting.changes index fe98d26..36e62d2 100644 --- a/ghc-skylighting.changes +++ b/ghc-skylighting.changes @@ -1,3 +1,44 @@ +------------------------------------------------------------------- +Mon Sep 20 07:12:01 UTC 2021 - psimons@suse.com + +- Update skylighting to version 0.12. + ## 0.12 + + * Properly handle include elements in keyword lists (#124). + A number of syntaxes (e.g. typescript, scala) include keyword + lists from other syntaxe,s and previously we weren't able to + handle this. + + There are several pieces to this change. We need to store lists + where other Syntaxes can look them up, so we add an `sLists` + field to `Syntax` [API change], and modify the parser to fill this. + We change lists so that their values are not just a `Text`, but a + `ListItem` that can either be a textual value or an include directive, + specifying a `ListName` (syntax name and list name). + + The `Keyword` constructor for `Matcher` now takes, instead of a + `WordSet`, Either a `ListName` or a `WordSet` (API change). + + Skylighting.Parser now exports `resolveKeywords` (API change), + which modifies all `Keyword` matchers in a syntax so that Left + values with a `ListName` become Right values with resolved `WordSet`s. + The tokenizer applies this function automatically to the SyntaxMap + given in Config. But it is more efficient to do this conversion + just once, rather than every time `tokenize` is called. So we have + `loadSyntaxesFromDir` call it on the `SyntaxMap`. With this + optimization, there is not an appreciable performance cost to the + changes described above. + + * Skylighting.Regex: Fix bug with regexes like `a{10}b` (#133). + This requires exactly 10 a's; previously we interpreted it as + "at least 10." + + * skylighting-extract: take a directory as argument rather than files. + This allows us to use `loadSyntaxesFromDir`. + + * Update xml syntax definitions from upstream: + julia, cmake, cpp, isocpp, markdown, python, toml. + ------------------------------------------------------------------- Mon Jul 19 07:06:15 UTC 2021 - psimons@suse.com diff --git a/ghc-skylighting.spec b/ghc-skylighting.spec index bcc080a..853f962 100644 --- a/ghc-skylighting.spec +++ b/ghc-skylighting.spec @@ -18,7 +18,7 @@ %global pkg_name skylighting Name: ghc-%{pkg_name} -Version: 0.11 +Version: 0.12 Release: 0 Summary: Syntax highlighting library License: GPL-2.0-or-later diff --git a/skylighting-0.11.tar.gz b/skylighting-0.11.tar.gz deleted file mode 100644 index 8c8fb07..0000000 --- a/skylighting-0.11.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f9a409f662863d87abe5606b7fc8c530728398f9510ed1b3cfcffa62640aa18a -size 675242 diff --git a/skylighting-0.12.tar.gz b/skylighting-0.12.tar.gz new file mode 100644 index 0000000..5b4fdf1 --- /dev/null +++ b/skylighting-0.12.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7e3cdd5efc7846d763077d81817ac3b07438f7d9aab62c1305979597b6cfa3c1 +size 1132336