#4570 Sync improvements to syntax highlighting from highlightjs-rpm-specfile
Merged 4 years ago by pingou. Opened 4 years ago by ngompa.

@@ -2,6 +2,7 @@ 

  Language: rpm-specfile

  Description: RPM Specfile

  Author: Ryan Lerch <rlerch@redhat.com>

+ Contributors: Neal Gompa <ngompa13@gmail.com>

  */

  

  /*
@@ -9,24 +10,24 @@ 

      variables. see https://github.com/isagalaev/highlight.js/blob/905119aad47d4bb3d4fbaa14df7598034dccb6a3/tools/utility.js

      for the list of things it replaces

  */

- hljs.registerLanguage("specfile", function(e) {

+ hljs.registerLanguage("rpm-specfile", function(e) {

    return {

-     aliases: ['spec'],

+     aliases: ['rpm', 'spec', 'rpm-spec', 'specfile'],

      c:[

          hljs.HCM,

          hljs.ASM,

          hljs.QSM,

          {

              cN: "type",

-             b:  /^(Name|BuildRequires|Version|Release|Epoch|Summary|Group|License|Packager|Vendor|Icon|URL|Distribution|Prefix|Patch[0-9]*|Source[0-9]*|Requires\(?[a-z]*\)?|[a-z]+Req|Obsoletes|Suggests|Provides|Conflicts|RemovePathPostfixes|Build[a-z]+|[a-z]+Arch|Auto[a-z]+)(:)/,

+             b:  /^(Name|BuildRequires|BuildConflicts|Version|Release|Epoch|Summary|Group|License|Packager|Vendor|Icon|URL|Distribution|Prefix|Patch[0-9]*|Source[0-9]*|Requires\(?[a-z]*\)?|[a-zA-Z]+Req|Obsoletes|Recommends|Suggests|Supplements|Enhances|Provides|Conflicts|RemovePathPostfixes|Build[a-zA-Z]+|[a-zA-Z]+Arch|Auto[a-zA-Z]+)(:)/,

          },

          {

              cN: "keyword",

-             b: /(%)(?:package|prep|build|description|install|clean|changelog|check|pre[a-z]*|post[a-z]*|trigger[a-z]*|files)/,

+             b: /(%)(?:package|prep|generate_buildrequires|sourcelist|patchlist|build|description|install|verifyscript|clean|changelog|check|pre[a-z]*|post[a-z]*|trigger[a-z]*|files)/,

          },

          {

              cN: "link",

-             b: /(%)(if|else|endif)/,

+             b: /(%)(if|ifarch|ifnarch|ifos|ifnos|elif|elifarch|elifos|else|endif)/,

          },

          {

              cN: "link",

file modified
+1 -1
@@ -97,7 +97,7 @@ 

      """

  

      override_rules = pagure_config.get(

-         "SYNTAX_ALIAS_OVERRIDES", {".spec": "specfile", ".patch": "diff"}

+         "SYNTAX_ALIAS_OVERRIDES", {".spec": "rpm-specfile", ".patch": "diff"}

      )

      fn, fn_ext = splitext(filename)

  

This file was upstreamed in a different form as highlightjs-rpm-specfile,
and that version was improved to cover many of the new features in
RPM 4.14 and RPM 4.15.

This change syncs those improvements back into our version.

In addition, the default syntax highlight override now uses the upstream
name for the rpm specfile syntax highlighter.

Signed-off-by: Neal Gompa ngompa13@gmail.com

rebased onto a3510b005b0d6c1b0c3925d65ed39ac08fc74d3c

4 years ago

rebased onto 5cd4a0e50202b77731a302a3c7ecbb57acbff2d1

4 years ago

rebased onto 5fde904b5967c8122c3ac591489ba7b5dc9d2e69

4 years ago

rebased onto 7300f8401890ff246b4f15842c34828c8a4fd733

4 years ago

rebased onto b06d22f

4 years ago

Commit b81ed58 fixes this pull-request

Pull-Request has been merged by pingou

4 years ago