chore: bump version to 4.0.4

Create release containing typo fixes (#580).

.github/workflows/codeql-analysis.yml

@@ -1,66 +0,0 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-# ******** NOTE ********
-
-name: "CodeQL"
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ master ]
-  schedule:
-    - cron: '45 23 * * 0'
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: [ 'go' ]
-        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
-        # Learn more...
-        # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v2
-
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
-      with:
-        languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        # queries: ./path/to/local/query, your-org/your-repo/queries@main
-
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    #- name: Autobuild
-      #uses: github/codeql-action/autobuild@v1
-
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
-
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
-
-    - run: make
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1

Dockerfile

@@ -1,8 +0,0 @@
-# NB: this image isn't used anywhere in the build pipeline. It exists to
-# conveniently facilitate ad-hoc experimentation in a sandboxed environment
-# during development.
-FROM golang:1.15-alpine
-
-RUN apk add git less make
-
-WORKDIR /app

Makefile

@@ -7,7 +7,6 @@ dist_dir := ./dist
 CAT    := cat
 COLUMN := column
 CTAGS  := ctags
-DOCKER := docker
 GO     := go
 GREP   := grep
 GZIP   := gzip --best
@@ -21,8 +20,6 @@ SED    := sed
 SORT   := sort
 ZIP    := zip -m
 
-docker_image := cheat-devel:latest
-
 # build flags
 BUILD_FLAGS  := -ldflags="-s -w" -mod vendor -trimpath
 GOBIN        :=
@@ -108,7 +105,6 @@ clean: $(dist_dir)
 .PHONY: distclean
 distclean:
 	$(RM) -f tags
-	@$(DOCKER) image rm -f $(docker_image)
 
 ## setup: install revive (linter) and scc (sloc tool)
 .PHONY: setup
@@ -136,10 +132,6 @@ man:
 vendor:
 	$(GO) mod vendor && $(GO) mod tidy && $(GO) mod verify
 
-## vendor-update: update vendored dependencies
-vendor-update:
-	$(GO) get -t -u ./... 
-
 ## fmt: run go fmt
 .PHONY: fmt
 fmt:
@@ -173,16 +165,6 @@ check: | vendor fmt lint vet test
 .PHONY: prepare
 prepare: | $(dist_dir) clean generate vendor fmt lint vet test
 
-## docker-setup: create a docker image for use during development
-.PHONY: docker-setup
-docker-setup:
-	$(DOCKER) build  -t $(docker_image) -f Dockerfile .
-
-## docker-sh: shell into the docker development container
-.PHONY: docker-sh
-docker-sh:
-	$(DOCKER) run -v $(shell pwd):/app -ti $(docker_image) /bin/ash
-
 ## help: display this help text
 .PHONY: help
 help:

README.md

@@ -47,17 +47,17 @@ Installing
 `cheat` has no dependencies. To install it, download the executable from the
 [releases][] page and place it on your `PATH`.
 
-Alternatively, if you have [go][] installed, you may install `cheat` using `go
-get`:
-
-```sh
-go get -u github.com/cheat/cheat/cmd/cheat
-```
 
 Configuring
 -----------
 ### conf.yml ###
 `cheat` is configured by a YAML file that will be auto-generated on first run.
+Should you need to create a config file manually, you can do
+so via:
+
+```sh
+mkdir -p ~/.config/cheat && cheat --init > ~/.config/cheat/conf.yml
+```
 
 By default, the config file is assumed to exist on an XDG-compliant
 configuration path like `~/.config/cheat/conf.yml`. If you would like to store
@@ -211,4 +211,3 @@ Additionally, `cheat` supports enhanced autocompletion via integration with
 [cheatsheets]: https://github.com/cheat/cheatsheets
 [completions]: https://github.com/cheat/cheat/tree/master/scripts
 [fzf]:         https://github.com/junegunn/fzf
-[go]:          https://golang.org

cmd/cheat/cmd_directories.go

@@ -27,5 +27,5 @@ func cmdDirectories(opts map[string]interface{}, conf config.Config) {
 
 	// write columnized output to stdout
 	w.Flush()
-	display.Write(out.String(), conf)
+	display.Display(out.String(), conf)
 }

cmd/cheat/cmd_list.go

@@ -37,8 +37,8 @@ func cmdList(opts map[string]interface{}, conf config.Config) {
 	// sheets with local sheets), here we simply want to create a slice
 	// containing all sheets.
 	flattened := []sheet.Sheet{}
-	for _, pathsheets := range cheatsheets {
+	for _, pathSheets := range cheatsheets {
-		for _, s := range pathsheets {
+		for _, s := range pathSheets {
 			flattened = append(flattened, s)
 		}
 	}
@@ -105,5 +105,5 @@ func cmdList(opts map[string]interface{}, conf config.Config) {
 
 	// write columnized output to stdout
 	w.Flush()
-	display.Write(out.String(), conf)
+	display.Display(out.String(), conf)
 }

cmd/cheat/cmd_search.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/cheat/cheat/internal/config"
 	"github.com/cheat/cheat/internal/display"
+	"github.com/cheat/cheat/internal/sheet"
 	"github.com/cheat/cheat/internal/sheets"
 )
 
@@ -31,65 +32,71 @@ func cmdSearch(opts map[string]interface{}, conf config.Config) {
 		)
 	}
 
-	// iterate over each cheatpath
+	// consolidate the cheatsheets found on all paths into a single map of
-	out := ""
+	// `title` => `sheet` (ie, allow more local cheatsheets to override less
-	for _, pathcheats := range cheatsheets {
+	// local cheatsheets)
+	consolidated := sheets.Consolidate(cheatsheets)
 
-		// sort the cheatsheets alphabetically, and search for matches
+	// if <cheatsheet> was provided, search that single sheet only
-		for _, sheet := range sheets.Sort(pathcheats) {
+	if opts["<cheatsheet>"] != nil {
 
-			// if <cheatsheet> was provided, constrain the search only to
+		cheatsheet := opts["<cheatsheet>"].(string)
-			// matching cheatsheets
-			if opts["<cheatsheet>"] != nil && sheet.Title != opts["<cheatsheet>"] {
-				continue
-			}
 
-			// assume that we want to perform a case-insensitive search for <phrase>
+		// assert that the cheatsheet exists
-			pattern := "(?i)" + phrase
+		s, ok := consolidated[cheatsheet]
+		if !ok {
+			fmt.Printf("No cheatsheet found for '%s'.\n", cheatsheet)
+			os.Exit(2)
+		}
 
-			// unless --regex is provided, in which case we pass the regex unaltered
+		consolidated = map[string]sheet.Sheet{
-			if opts["--regex"] == true {
+			cheatsheet: s,
-				pattern = phrase
-			}
-
-			// compile the regex
-			reg, err := regexp.Compile(pattern)
-			if err != nil {
-				fmt.Fprintln(os.Stderr, fmt.Sprintf("failed to compile regexp: %s, %v", pattern, err))
-				os.Exit(1)
-			}
-
-			// `Search` will return text entries that match the search terms. We're
-			// using it here to overwrite the prior cheatsheet Text, filtering it to
-			// only what is relevant
-			sheet.Text = sheet.Search(reg)
-
-			// if the sheet did not match the search, ignore it and move on
-			if sheet.Text == "" {
-				continue
-			}
-
-			// if colorization was requested, apply it here
-			if conf.Color(opts) {
-				sheet.Colorize(conf)
-			}
-
-			// display the cheatsheet title and path
-			out += fmt.Sprintf("%s %s\n",
-				display.Underline(sheet.Title),
-				display.Faint(fmt.Sprintf("(%s)", sheet.CheatPath), conf),
-			)
-
-			// indent each line of content
-			out += display.Indent(sheet.Text) + "\n"
 		}
 	}
 
-	// trim superfluous newlines
+	// sort the cheatsheets alphabetically, and search for matches
-	out = strings.TrimSpace(out)
+	out := ""
+	for _, sheet := range sheets.Sort(consolidated) {
+
+		// assume that we want to perform a case-insensitive search for <phrase>
+		pattern := "(?i)" + phrase
+
+		// unless --regex is provided, in which case we pass the regex unaltered
+		if opts["--regex"] == true {
+			pattern = phrase
+		}
+
+		// compile the regex
+		reg, err := regexp.Compile(pattern)
+		if err != nil {
+			fmt.Fprintln(os.Stderr, fmt.Sprintf("failed to compile regexp: %s, %v", pattern, err))
+			os.Exit(1)
+		}
+
+		// `Search` will return text entries that match the search terms. We're
+		// using it here to overwrite the prior cheatsheet Text, filtering it to
+		// only what is relevant
+		sheet.Text = sheet.Search(reg)
+
+		// if the sheet did not match the search, ignore it and move on
+		if sheet.Text == "" {
+			continue
+		}
+
+		// if colorization was requested, apply it here
+		if conf.Color(opts) {
+			sheet.Colorize(conf)
+		}
+
+		// output the cheatsheet title
+		out += fmt.Sprintf("%s:\n", sheet.Title)
+
+		// indent each line of content with two spaces
+		for _, line := range strings.Split(sheet.Text, "\n") {
+			out += fmt.Sprintf("  %s\n", line)
+		}
+	}
 
 	// display the output
-	// NB: resist the temptation to call `display.Display` multiple times in
+	display.Display(out, conf)
-	// the loop above. That will not play nicely with the paginator.
-	display.Write(out, conf)
 }

cmd/cheat/cmd_tags.go

@@ -26,5 +26,5 @@ func cmdTags(opts map[string]interface{}, conf config.Config) {
 	}
 
 	// display the output
-	display.Write(out, conf)
+	display.Display(out, conf)
 }

cmd/cheat/cmd_view.go

@@ -30,39 +30,9 @@ func cmdView(opts map[string]interface{}, conf config.Config) {
 		)
 	}
 
-	// if --all was passed, display cheatsheets from all cheatpaths
+	// consolidate the cheatsheets found on all paths into a single map of
-	if opts["--all"].(bool) {
+	// `title` => `sheet` (ie, allow more local cheatsheets to override less
-		// iterate over the cheatpaths
+	// local cheatsheets)
-		out := ""
-		for _, cheatpath := range cheatsheets {
-
-			// if the cheatpath contains the specified cheatsheet, display it
-			if sheet, ok := cheatpath[cheatsheet]; ok {
-
-				// identify the matching cheatsheet
-				out += fmt.Sprintf("%s %s\n",
-					display.Underline(sheet.Title),
-					display.Faint(fmt.Sprintf("(%s)", sheet.CheatPath), conf),
-				)
-
-				// apply colorization if requested
-				if conf.Color(opts) {
-					sheet.Colorize(conf)
-				}
-
-				// display the cheatsheet
-				out += display.Indent(sheet.Text) + "\n"
-			}
-		}
-
-		// display and exit
-		display.Write(strings.TrimSuffix(out, "\n"), conf)
-		os.Exit(0)
-	}
-
-	// otherwise, consolidate the cheatsheets found on all paths into a single
-	// map of `title` => `sheet` (ie, allow more local cheatsheets to override
-	// less local cheatsheets)
 	consolidated := sheets.Consolidate(cheatsheets)
 
 	// fail early if the requested cheatsheet does not exist
@@ -78,5 +48,5 @@ func cmdView(opts map[string]interface{}, conf config.Config) {
 	}
 
 	// display the cheatsheet
-	display.Write(sheet.Text, conf)
+	display.Display(sheet.Text, conf)
 }

cmd/cheat/docopt.txt

@@ -3,12 +3,11 @@ Usage:
 
 Options:
   --init                  Write a default config file to stdout
-  -a --all                Search among all cheatpaths
   -c --colorize           Colorize output
   -d --directories        List cheatsheet directories
   -e --edit=<cheatsheet>  Edit <cheatsheet>
   -l --list               List cheatsheets
-  -p --path=<name>        Return only sheets found on cheatpath <name>
+  -p --path=<name>        Return only sheets found on path <name>
   -r --regex              Treat search <phrase> as a regex
   -s --search=<phrase>    Search cheatsheets for <phrase>
   -t --tag=<tag>          Return only sheets matching <tag>

cmd/cheat/main.go

@@ -5,6 +5,7 @@ package main
 import (
 	"fmt"
 	"os"
+	"path"
 	"runtime"
 	"strings"
 
@@ -16,7 +17,7 @@ import (
 	"github.com/cheat/cheat/internal/installer"
 )
 
-const version = "4.2.0"
+const version = "4.0.4"
 
 func main() {
 
@@ -73,16 +74,62 @@ func main() {
 			os.Exit(0)
 		}
 
-		// choose a confpath
+		// read the config template
-		confpath = confpaths[0]
+		configs := configs()
 
-		// run the installer
+		// determine the appropriate paths for config data and (optional) community
-		if err := installer.Run(configs(), confpath); err != nil {
+		// cheatsheets based on the user's platform
-			fmt.Fprintf(os.Stderr, "failed to run installer: %v\n", err)
+		confpath = confpaths[0]
+		confdir := path.Dir(confpath)
+
+		// create paths for community and personal cheatsheets
+		community := path.Join(confdir, "/cheatsheets/community")
+		personal := path.Join(confdir, "/cheatsheets/personal")
+
+		// template the above paths into the default configs
+		configs = strings.Replace(configs, "COMMUNITY_PATH", community, -1)
+		configs = strings.Replace(configs, "PERSONAL_PATH", personal, -1)
+
+		// prompt the user to download the community cheatsheets
+		yes, err = installer.Prompt(
+			"Would you like to download the community cheatsheets? [Y/n]",
+			true,
+		)
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "failed to create config: %v\n", err)
+			os.Exit(1)
+		}
+
+		// clone the community cheatsheets if so instructed
+		if yes {
+			// clone the community cheatsheets
+			if err := installer.Clone(community); err != nil {
+				fmt.Fprintf(os.Stderr, "failed to create config: %v\n", err)
+				os.Exit(1)
+			}
+
+			// also create a directory for personal cheatsheets
+			if err := os.MkdirAll(personal, os.ModePerm); err != nil {
+				fmt.Fprintf(
+					os.Stderr,
+					"failed to create config: failed to create directory: %s: %v\n",
+					personal,
+					err)
+				os.Exit(1)
+			}
+		}
+
+		// the config file does not exist, so we'll try to create one
+		if err = config.Init(confpath, configs); err != nil {
+			fmt.Fprintf(
+				os.Stderr,
+				"failed to create config file: %s: %v\n",
+				confpath,
+				err,
+			)
 			os.Exit(1)
 		}
 
-		// notify the user and exit
 		fmt.Printf("Created config file: %s\n", confpath)
 		fmt.Println("Please read this file for advanced configuration information.")
 		os.Exit(0)
@@ -138,9 +185,6 @@ func main() {
 	case opts["<cheatsheet>"] != nil:
 		cmd = cmdView
 
-	case opts["--tag"] != nil && opts["--tag"].(string) != "":
-		cmd = cmdList
-
 	default:
 		fmt.Println(usage())
 		os.Exit(0)

cmd/cheat/str_usage.go

@@ -12,12 +12,11 @@ func usage() string {
 
 Options:
   --init                  Write a default config file to stdout
-  -a --all                Search among all cheatpaths
   -c --colorize           Colorize output
   -d --directories        List cheatsheet directories
   -e --edit=<cheatsheet>  Edit <cheatsheet>
   -l --list               List cheatsheets
-  -p --path=<name>        Return only sheets found on cheatpath <name>
+  -p --path=<name>        Return only sheets found on path <name>
   -r --regex              Treat search <phrase> as a regex
   -s --search=<phrase>    Search cheatsheets for <phrase>
   -t --tag=<tag>          Return only sheets matching <tag>

doc/cheat.1

@@ -1,4 +1,4 @@
-.\" Automatically generated by Pandoc 2.2.1
+.\" Automatically generated by Pandoc 1.17.2
 .\"
 .TH "CHEAT" "1" "" "" "General Commands Manual"
 .hy
@@ -17,62 +17,62 @@ commands that they use frequently, but not frequently enough to
 remember.
 .SH OPTIONS
 .TP
-.B \[en]init
+.B \-\-init
 Print a config file to stdout.
 .RS
 .RE
 .TP
-.B \-c, \[en]colorize
+.B \-c, \-\-colorize
 Colorize output.
 .RS
 .RE
 .TP
-.B \-d, \[en]directories
+.B \-d, \-\-directories
 List cheatsheet directories.
 .RS
 .RE
 .TP
-.B \-e, \[en]edit=\f[I]CHEATSHEET\f[]
+.B \-e, \-\-edit=\f[I]CHEATSHEET\f[]
 Open \f[I]CHEATSHEET\f[] for editing.
 .RS
 .RE
 .TP
-.B \-l, \[en]list
+.B \-l, \-\-list
 List available cheatsheets.
 .RS
 .RE
 .TP
-.B \-p, \[en]path=\f[I]PATH\f[]
+.B \-p, \-\-path=\f[I]PATH\f[]
 Filter only to sheets found on path \f[I]PATH\f[].
 .RS
 .RE
 .TP
-.B \-r, \[en]regex
+.B \-r, \-\-regex
 Treat search \f[I]PHRASE\f[] as a regular expression.
 .RS
 .RE
 .TP
-.B \-s, \[en]search=\f[I]PHRASE\f[]
+.B \-s, \-\-search=\f[I]PHRASE\f[]
 Search cheatsheets for \f[I]PHRASE\f[].
 .RS
 .RE
 .TP
-.B \-t, \[en]tag=\f[I]TAG\f[]
+.B \-t, \-\-tag=\f[I]TAG\f[]
 Filter only to sheets tagged with \f[I]TAG\f[].
 .RS
 .RE
 .TP
-.B \-T, \[en]tags
+.B \-T, \-\-tags
 List all tags in use.
 .RS
 .RE
 .TP
-.B \-v, \[en]version
+.B \-v, \-\-version
 Print the version number.
 .RS
 .RE
 .TP
-.B \[en]rm=\f[I]CHEATSHEET\f[]
+.B \-\-rm=\f[I]CHEATSHEET\f[]
 Remove (deletes) \f[I]CHEATSHEET\f[].
 .RS
 .RE
@@ -88,7 +88,7 @@ cheat \-e \f[I]foo\f[]
 .RS
 .RE
 .TP
-.B To edit (or create) the foo/bar cheatsheet on the `work' cheatpath:
+.B To edit (or create) the foo/bar cheatsheet on the \[aq]work\[aq] cheatpath:
 cheat \-p \f[I]work\f[] \-e \f[I]foo/bar\f[]
 .RS
 .RE
@@ -103,7 +103,7 @@ cheat \-l
 .RS
 .RE
 .TP
-.B To list all cheatsheets whose titles match `apt':
+.B To list all cheatsheets whose titles match \[aq]apt\[aq]:
 cheat \-l \f[I]apt\f[]
 .RS
 .RE
@@ -113,23 +113,23 @@ cheat \-T
 .RS
 .RE
 .TP
-.B To list available cheatsheets that are tagged as `personal':
+.B To list available cheatsheets that are tagged as \[aq]personal\[aq]:
 cheat \-l \-t \f[I]personal\f[]
 .RS
 .RE
 .TP
-.B To search for `ssh' among all cheatsheets, and colorize matches:
+.B To search for \[aq]ssh\[aq] among all cheatsheets, and colorize matches:
 cheat \-c \-s \f[I]ssh\f[]
 .RS
 .RE
 .TP
 .B To search (by regex) for cheatsheets that contain an IP address:
-cheat \-c \-r \-s \f[I]`(?:[0\-9]{1,3}.){3}[0\-9]{1,3}'\f[]
+cheat \-c \-r \-s \f[I]\[aq](?:[0\-9]{1,3}.){3}[0\-9]{1,3}\[aq]\f[]
 .RS
 .RE
 .TP
 .B To remove (delete) the foo/bar cheatsheet:
-cheat \[en]rm \f[I]foo/bar\f[]
+cheat \-\-rm \f[I]foo/bar\f[]
 .RS
 .RE
 .SH FILES
@@ -159,15 +159,15 @@ depending upon your platform:
 \f[B]cheat\f[] will search in the order specified above.
 The first \f[I]conf.yaml\f[] encountered will be respected.
 .PP
-If \f[B]cheat\f[] cannot locate a config file, it will ask if you'd like
+If \f[B]cheat\f[] cannot locate a config file, it will ask if you\[aq]d
-to generate one automatically.
+like to generate one automatically.
 Alternatively, you may also generate a config file manually by running
-\f[B]cheat \[en]init\f[] and saving its output to the appropriate
+\f[B]cheat \-\-init\f[] and saving its output to the appropriate
 location for your platform.
 .SS Cheatpaths
 .PP
-\f[B]cheat\f[] reads its cheatsheets from \[lq]cheatpaths\[rq], which
+\f[B]cheat\f[] reads its cheatsheets from "cheatpaths", which are the
-are the directories in which cheatsheets are stored.
+directories in which cheatsheets are stored.
 Cheatpaths may be configured in \f[I]conf.yaml\f[], and viewed via
 \f[B]cheat \-d\f[].
 .PP

go.mod

@@ -3,17 +3,15 @@ module github.com/cheat/cheat
 go 1.14
 
 require (
-	github.com/alecthomas/chroma v0.8.2
+	github.com/alecthomas/chroma v0.8.0
 	github.com/davecgh/go-spew v1.1.1
-	github.com/dlclark/regexp2 v1.4.0 // indirect
 	github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815
 	github.com/kr/text v0.2.0 // indirect
 	github.com/mattn/go-isatty v0.0.12
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
 	github.com/sergi/go-diff v1.1.0 // indirect
-	golang.org/x/sys v0.0.0-20201126233918-771906719818 // indirect
 	gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
 	gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0
-	gopkg.in/yaml.v2 v2.4.0
+	gopkg.in/yaml.v2 v2.3.0
 )

go.sum

@@ -1,7 +1,7 @@
 github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38 h1:smF2tmSOzy2Mm+0dGI2AIUHY+w0BUc+4tn40djz7+6U=
 github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38/go.mod h1:r7bzyVFMNntcxPZXK3/+KdruV1H5KSlyVY0gc+NgInI=
-github.com/alecthomas/chroma v0.8.2 h1:x3zkuE2lUk/RIekyAJ3XRqSCP4zwWDfcw/YJCuCAACg=
+github.com/alecthomas/chroma v0.8.0 h1:HS+HE97sgcqjQGu5uVr8jIE55Mmh5UeQ7kckAhHg2pY=
-github.com/alecthomas/chroma v0.8.2/go.mod h1:sko8vR34/90zvl5QdcUdvzL3J8NKjAUx9va9jPuFNoM=
+github.com/alecthomas/chroma v0.8.0/go.mod h1:sko8vR34/90zvl5QdcUdvzL3J8NKjAUx9va9jPuFNoM=
 github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721 h1:JHZL0hZKJ1VENNfmXvHbgYlbUOvpzYzvy2aZU5gXVeo=
 github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721/go.mod h1:QO9JBoKquHd+jz9nshCh40fOfO+JzsoXy8qTHF68zU0=
 github.com/alecthomas/kong v0.2.4/go.mod h1:kQOmtJgV+Lb4aj+I2LEn40cbtawdWJ9Y8QLq+lElKxE=
@@ -15,8 +15,6 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dlclark/regexp2 v1.2.0 h1:8sAhBGEM0dRWogWqWyQeIJnxjWO6oIjl8FKqREDsGfk=
 github.com/dlclark/regexp2 v1.2.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
-github.com/dlclark/regexp2 v1.4.0 h1:F1rxgk7p4uKjwIQxBs9oAXe5CqrXlCduYEJvrF4u93E=
-github.com/dlclark/regexp2 v1.4.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
 github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815 h1:bWDMxwH3px2JBh6AyO7hdCn/PkvCZXii8TGj7sbtEbQ=
 github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
 github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
@@ -53,8 +51,6 @@ golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200413165638-669c56c373c4 h1:opSr2sbRXk5X5/givKrrKj9HXxFpW2sdCiP8MJSKLQY=
 golang.org/x/sys v0.0.0-20200413165638-669c56c373c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201126233918-771906719818 h1:f1CIuDlJhwANEC2MM87MBEVMr3jl5bifgsfj90XAF9c=
-golang.org/x/sys v0.0.0-20201126233918-771906719818/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -64,5 +60,5 @@ gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0 h1:POO/ycCATvegFmVuPpQzZFJ+p
 gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0/go.mod h1:WDnlLJ4WF5VGsH/HVa3CI79GS0ol3YnhVnKP89i0kNg=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
+gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
-gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
+gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

internal/config/color_test.go

@@ -1,22 +0,0 @@
-package config
-
-import (
-	"testing"
-)
-
-// TestColor asserts that colorization rules are properly respected
-func TestColor(t *testing.T) {
-
-	// mock a config
-	conf := Config{}
-
-	opts := map[string]interface{}{"--colorize": false}
-	if conf.Color(opts) {
-		t.Errorf("failed to respect --colorize (false)")
-	}
-
-	opts = map[string]interface{}{"--colorize": true}
-	if !conf.Color(opts) {
-		t.Errorf("failed to respect --colorize (true)")
-	}
-}

internal/config/init_test.go

@@ -1,38 +0,0 @@
-package config
-
-import (
-	"io/ioutil"
-	"os"
-	"testing"
-)
-
-// TestInit asserts that configs are properly initialized
-func TestInit(t *testing.T) {
-
-	// initialize a temporary config file
-	confFile, err := ioutil.TempFile("", "cheat-test")
-	if err != nil {
-		t.Errorf("failed to create temp file: %v", err)
-	}
-
-	// clean up the temp file
-	defer os.Remove(confFile.Name())
-
-	// initialize the config file
-	conf := "mock config data"
-	if err = Init(confFile.Name(), conf); err != nil {
-		t.Errorf("failed to init config file: %v", err)
-	}
-
-	// read back the config file contents
-	bytes, err := ioutil.ReadFile(confFile.Name())
-	if err != nil {
-		t.Errorf("failed to read config file: %v", err)
-	}
-
-	// assert that the contents were written correctly
-	got := string(bytes)
-	if got != conf {
-		t.Errorf("failed to write configs: want: %s, got: %s", conf, got)
-	}
-}

internal/config/path_test.go

@@ -1,53 +0,0 @@
-package config
-
-import (
-	"io/ioutil"
-	"os"
-	"testing"
-)
-
-// TestPathConfigNotExists asserts that `Path` identifies non-existent config
-// files
-func TestPathConfigNotExists(t *testing.T) {
-
-	// package (invalid) cheatpaths
-	paths := []string{"/cheat-test-conf-does-not-exist"}
-
-	// assert
-	if _, err := Path(paths); err == nil {
-		t.Errorf("failed to identify non-existent config file")
-	}
-
-}
-
-// TestPathConfigExists asserts that `Path` identifies existent config files
-func TestPathConfigExists(t *testing.T) {
-
-	// initialize a temporary config file
-	confFile, err := ioutil.TempFile("", "cheat-test")
-	if err != nil {
-		t.Errorf("failed to create temp file: %v", err)
-	}
-
-	// clean up the temp file
-	defer os.Remove(confFile.Name())
-
-	// package cheatpaths
-	paths := []string{
-		"/cheat-test-conf-does-not-exist",
-		confFile.Name(),
-	}
-
-	// assert
-	got, err := Path(paths)
-	if err != nil {
-		t.Errorf("failed to identify config file: %v", err)
-	}
-	if got != confFile.Name() {
-		t.Errorf(
-			"failed to return config path: want: %s, got: %s",
-			confFile.Name(),
-			got,
-		)
-	}
-}

internal/display/display.go

@@ -9,9 +9,9 @@ import (
 	"github.com/cheat/cheat/internal/config"
 )
 
-// Write writes output either directly to stdout, or through a pager,
+// Display writes output either directly to stdout, or through a pager,
 // depending upon configuration.
-func Write(out string, conf config.Config) {
+func Display(out string, conf config.Config) {
 	// if no pager was configured, print the output to stdout and exit
 	if conf.Pager == "" {
 		fmt.Print(out)

internal/display/faint.go

@@ -1,18 +0,0 @@
-package display
-
-import (
-	"fmt"
-
-	"github.com/cheat/cheat/internal/config"
-)
-
-// Faint returns an faint string
-func Faint(str string, conf config.Config) string {
-	// make `str` faint only if colorization has been requested
-	if conf.Colorize {
-		return fmt.Sprintf(fmt.Sprintf("\033[2m%s\033[0m", str))
-	}
-
-	// otherwise, return the string unmodified
-	return str
-}

internal/display/faint_test.go

@@ -1,27 +0,0 @@
-package display
-
-import (
-	"testing"
-
-	"github.com/cheat/cheat/internal/config"
-)
-
-// TestFaint asserts that Faint applies faint formatting
-func TestFaint(t *testing.T) {
-
-	// case: apply colorization
-	conf := config.Config{Colorize: true}
-	want := "\033[2mfoo\033[0m"
-	got := Faint("foo", conf)
-	if want != got {
-		t.Errorf("failed to faint: want: %s, got: %s", want, got)
-	}
-
-	// case: do not apply colorization
-	conf.Colorize = false
-	want = "foo"
-	got = Faint("foo", conf)
-	if want != got {
-		t.Errorf("failed to faint: want: %s, got: %s", want, got)
-	}
-}

internal/display/indent.go

@@ -1,21 +0,0 @@
-package display
-
-import (
-	"fmt"
-	"strings"
-)
-
-// Indent prepends each line of a string with a tab
-func Indent(str string) string {
-
-	// trim superfluous whitespace
-	str = strings.TrimSpace(str)
-
-	// prepend each line with a tab character
-	out := ""
-	for _, line := range strings.Split(str, "\n") {
-		out += fmt.Sprintf("\t%s\n", line)
-	}
-
-	return out
-}

internal/display/indent_test.go

@@ -1,12 +0,0 @@
-package display
-
-import "testing"
-
-// TestIndent asserts that Indent prepends a tab to each line
-func TestIndent(t *testing.T) {
-	got := Indent("foo\nbar\nbaz")
-	want := "\tfoo\n\tbar\n\tbaz\n"
-	if got != want {
-		t.Errorf("failed to indent: want: %s, got: %s", want, got)
-	}
-}

internal/display/underline.go

@@ -1,8 +0,0 @@
-package display
-
-import "fmt"
-
-// Underline returns an underlined string
-func Underline(str string) string {
-	return fmt.Sprintf(fmt.Sprintf("\033[4m%s\033[0m", str))
-}

internal/display/underline_test.go

@@ -1,14 +0,0 @@
-package display
-
-import (
-	"testing"
-)
-
-// TestUnderline asserts that Underline applies underline formatting
-func TestUnderline(t *testing.T) {
-	want := "\033[4mfoo\033[0m"
-	got := Underline("foo")
-	if want != got {
-		t.Errorf("failed to underline: want: %s, got: %s", want, got)
-	}
-}

internal/installer/clone.go

@@ -8,8 +8,8 @@ import (
 
 const cloneURL = "https://github.com/cheat/cheatsheets.git"
 
-// clone clones the community cheatsheets
+// Clone clones the community cheatsheets
-func clone(path string) error {
+func Clone(path string) error {
 
 	// perform the clone in a shell
 	cmd := exec.Command("git", "clone", cloneURL, path)

internal/installer/run.go

@@ -1,55 +0,0 @@
-package installer
-
-import (
-	"fmt"
-	"os"
-	"path"
-	"strings"
-
-	"github.com/cheat/cheat/internal/config"
-)
-
-// Run runs the installer
-func Run(configs string, confpath string) error {
-
-	// determine the appropriate paths for config data and (optional) community
-	// cheatsheets based on the user's platform
-	confdir := path.Dir(confpath)
-
-	// create paths for community and personal cheatsheets
-	community := path.Join(confdir, "/cheatsheets/community")
-	personal := path.Join(confdir, "/cheatsheets/personal")
-
-	// template the above paths into the default configs
-	configs = strings.Replace(configs, "COMMUNITY_PATH", community, -1)
-	configs = strings.Replace(configs, "PERSONAL_PATH", personal, -1)
-
-	// prompt the user to download the community cheatsheets
-	yes, err := Prompt(
-		"Would you like to download the community cheatsheets? [Y/n]",
-		true,
-	)
-	if err != nil {
-		return fmt.Errorf("failed to prompt: %v", err)
-	}
-
-	// clone the community cheatsheets if so instructed
-	if yes {
-		// clone the community cheatsheets
-		if err := clone(community); err != nil {
-			return fmt.Errorf("failed to clone cheatsheets: %v", err)
-		}
-
-		// also create a directory for personal cheatsheets
-		if err := os.MkdirAll(personal, os.ModePerm); err != nil {
-			return fmt.Errorf("failed to create directory: %v", err)
-		}
-	}
-
-	// the config file does not exist, so we'll try to create one
-	if err = config.Init(confpath, configs); err != nil {
-		return fmt.Errorf("failed to create config file: %v", err)
-	}
-
-	return nil
-}

internal/mock/path.go

@@ -13,7 +13,7 @@ func Path(filename string) string {
 	// determine the path of this file during runtime
 	_, thisfile, _, _ := runtime.Caller(0)
 
-	// compute the mock path
+	// compute the config path
 	file, err := filepath.Abs(
 		path.Join(
 			filepath.Dir(thisfile),
@@ -22,7 +22,7 @@ func Path(filename string) string {
 		),
 	)
 	if err != nil {
-		panic(fmt.Errorf("failed to resolve mock path: %v", err))
+		panic(fmt.Errorf("failed to resolve config path: %v", err))
 	}
 
 	return file

internal/sheet/colorize_test.go

@@ -1,34 +0,0 @@
-package sheet
-
-import (
-	"testing"
-
-	"github.com/cheat/cheat/internal/config"
-)
-
-// TestColorize asserts that syntax-highlighting is correctly applied
-func TestColorize(t *testing.T) {
-
-	// mock configs
-	conf := config.Config{
-		Formatter: "terminal16m",
-		Style:     "solarized-dark",
-	}
-
-	// mock a sheet
-	s := Sheet{
-		Text: "echo 'foo'",
-	}
-
-	// colorize the sheet text
-	s.Colorize(conf)
-
-	// initialize expectations
-	want := "echo"
-	want += " 'foo'"
-
-	// assert
-	if s.Text != want {
-		t.Errorf("failed to colorize sheet: want: %s, got: %s", want, s.Text)
-	}
-}

internal/sheet/copy_test.go

@@ -25,7 +25,7 @@ func TestCopyFlat(t *testing.T) {
 	}
 
 	// mock a cheatsheet struct
-	sheet, err := New("foo", "community", src.Name(), []string{}, false)
+	sheet, err := New("foo", src.Name(), []string{}, false)
 	if err != nil {
 		t.Errorf("failed to init cheatsheet: %v", err)
 	}
@@ -72,13 +72,7 @@ func TestCopyDeep(t *testing.T) {
 	}
 
 	// mock a cheatsheet struct
-	sheet, err := New(
+	sheet, err := New("/cheat-tests/alpha/bravo/foo", src.Name(), []string{}, false)
-		"/cheat-tests/alpha/bravo/foo",
-		"community",
-		src.Name(),
-		[]string{},
-		false,
-	)
 	if err != nil {
 		t.Errorf("failed to init cheatsheet: %v", err)
 	}

internal/sheet/sheet.go

@@ -10,19 +10,17 @@ import (
 
 // Sheet encapsulates sheet information
 type Sheet struct {
-	Title     string
+	Title    string
-	CheatPath string
+	Path     string
-	Path      string
+	Text     string
-	Text      string
+	Tags     []string
-	Tags      []string
+	Syntax   string
-	Syntax    string
+	ReadOnly bool
-	ReadOnly  bool
 }
 
 // New initializes a new Sheet
 func New(
 	title string,
-	cheatpath string,
 	path string,
 	tags []string,
 	readOnly bool,
@@ -48,12 +46,11 @@ func New(
 
 	// initialize and return a sheet
 	return Sheet{
-		Title:     title,
+		Title:    title,
-		CheatPath: cheatpath,
+		Path:     path,
-		Path:      path,
+		Text:     text + "\n",
-		Text:      text + "\n",
+		Tags:     tags,
-		Tags:      tags,
+		Syntax:   fm.Syntax,
-		Syntax:    fm.Syntax,
+		ReadOnly: readOnly,
-		ReadOnly:  readOnly,
 	}, nil
 }

internal/sheet/sheet_test.go

@@ -13,7 +13,6 @@ func TestSheetSuccess(t *testing.T) {
 	// initialize a sheet
 	sheet, err := New(
 		"foo",
-		"community",
 		mock.Path("sheet/foo"),
 		[]string{"alpha", "bravo"},
 		false,
@@ -62,7 +61,6 @@ func TestSheetFailure(t *testing.T) {
 	// initialize a sheet
 	_, err := New(
 		"foo",
-		"community",
 		mock.Path("/does-not-exist"),
 		[]string{"alpha", "bravo"},
 		false,
@@ -71,20 +69,3 @@ func TestSheetFailure(t *testing.T) {
 		t.Errorf("failed to return an error on unreadable sheet")
 	}
 }
-
-// TestSheetFrontMatterFailure asserts that an error is returned if the sheet's
-// frontmatter cannot be parsed.
-func TestSheetFrontMatterFailure(t *testing.T) {
-
-	// initialize a sheet
-	_, err := New(
-		"foo",
-		"community",
-		mock.Path("sheet/bad-fm"),
-		[]string{"alpha", "bravo"},
-		false,
-	)
-	if err == nil {
-		t.Errorf("failed to return an error on malformed front-matter")
-	}
-}

internal/sheets/load.go

@@ -59,13 +59,7 @@ func Load(cheatpaths []cp.Cheatpath) ([]map[string]sheet.Sheet, error) {
 				}
 
 				// parse the cheatsheet file into a `sheet` struct
-				s, err := sheet.New(
+				s, err := sheet.New(title, path, cheatpath.Tags, cheatpath.ReadOnly)
-					title,
-					cheatpath.Name,
-					path,
-					cheatpath.Tags,
-					cheatpath.ReadOnly,
-				)
 				if err != nil {
 					return fmt.Errorf(
 						"failed to load sheet: %s, path: %s, err: %v",

internal/sheets/load_test.go

@@ -1,62 +1,3 @@
 package sheets
 
-import (
+// TODO
-	"path"
-	"testing"
-
-	"github.com/cheat/cheat/internal/cheatpath"
-	"github.com/cheat/cheat/internal/mock"
-)
-
-// TestLoad asserts that sheets on valid cheatpaths can be loaded successfully
-func TestLoad(t *testing.T) {
-
-	// mock cheatpaths
-	cheatpaths := []cheatpath.Cheatpath{
-		{
-			Name:     "community",
-			Path:     path.Join(mock.Path("cheatsheets"), "community"),
-			ReadOnly: true,
-		},
-		{
-			Name:     "personal",
-			Path:     path.Join(mock.Path("cheatsheets"), "personal"),
-			ReadOnly: false,
-		},
-	}
-
-	// load cheatsheets
-	sheets, err := Load(cheatpaths)
-	if err != nil {
-		t.Errorf("failed to load cheatsheets: %v", err)
-	}
-
-	// assert that the correct number of sheets loaded
-	// (sheet load details are tested in `sheet_test.go`)
-	want := 4
-	if len(sheets) != want {
-		t.Errorf(
-			"failed to load correct number of cheatsheets: want: %d, got: %d",
-			want,
-			len(sheets),
-		)
-	}
-}
-
-// TestLoadBadPath asserts that an error is returned if a cheatpath is invalid
-func TestLoadBadPath(t *testing.T) {
-
-	// mock a bad cheatpath
-	cheatpaths := []cheatpath.Cheatpath{
-		{
-			Name:     "badpath",
-			Path:     "/cheat/test/path/does/not/exist",
-			ReadOnly: true,
-		},
-	}
-
-	// attempt to load the cheatpath
-	if _, err := Load(cheatpaths); err == nil {
-		t.Errorf("failed to reject invalid cheatpath")
-	}
-}

mocks/cheatsheets/community/bar

@@ -1,4 +0,0 @@
----
-tags: [ community ]
----
-This is the bar cheatsheet.

mocks/cheatsheets/community/foo

@@ -1,4 +0,0 @@
----
-tags: [ community ]
----
-This is the foo cheatsheet.

mocks/cheatsheets/personal/bat

@@ -1,4 +0,0 @@
----
-tags: [ personal ]
----
-This is the bat cheatsheet.

mocks/cheatsheets/personal/baz

@@ -1,4 +0,0 @@
----
-tags: [ personal ]
----
-This is the baz cheatsheet.

mocks/sheet/bad-fm

@@ -1,4 +0,0 @@
----
-syntax: sh
-
-This is malformed frontmatter.

vendor/github.com/alecthomas/chroma/.goreleaser.yml

@@ -6,8 +6,6 @@ release:
 brews:
   -
     install: bin.install "chroma"
-env:
-  - CGO_ENABLED=0
 builds:
 - goos:
     - linux

vendor/github.com/alecthomas/chroma/.travis.yml

@@ -0,0 +1,12 @@
+sudo: false
+language: go
+go:
+  - "1.13.x"
+script:
+  - go test -v ./...
+  - curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | bash -s v1.26.0
+  - ./bin/golangci-lint run
+  - git clean -fdx .
+after_success:
+  curl -sL https://git.io/goreleaser | bash && goreleaser
+

vendor/github.com/alecthomas/chroma/README.md

@@ -1,4 +1,4 @@
-# Chroma — A general purpose syntax highlighter in pure Go [![Golang Documentation](https://godoc.org/github.com/alecthomas/chroma?status.svg)](https://godoc.org/github.com/alecthomas/chroma) [![CircleCI](https://img.shields.io/circleci/project/github/alecthomas/chroma.svg)](https://circleci.com/gh/alecthomas/chroma) [![Go Report Card](https://goreportcard.com/badge/github.com/alecthomas/chroma)](https://goreportcard.com/report/github.com/alecthomas/chroma) [![Slack chat](https://img.shields.io/static/v1?logo=slack&style=flat&label=slack&color=green&message=gophers)](https://gophers.slack.com/messages/CN9DS8YF3)
+# Chroma — A general purpose syntax highlighter in pure Go [![Golang Documentation](https://godoc.org/github.com/alecthomas/chroma?status.svg)](https://godoc.org/github.com/alecthomas/chroma) [![Build Status](https://travis-ci.org/alecthomas/chroma.svg)](https://travis-ci.org/alecthomas/chroma) [![Gitter chat](https://badges.gitter.im/alecthomas.svg)](https://gitter.im/alecthomas/Lobby)
 
 > **NOTE:** As Chroma has just been released, its API is still in flux. That said, the high-level interface should not change significantly.
 
@@ -36,30 +36,29 @@ translators for Pygments lexers and styles.
 Prefix | Language
 :----: | --------
 A | ABAP, ABNF, ActionScript, ActionScript 3, Ada, Angular2, ANTLR, ApacheConf, APL, AppleScript, Arduino, Awk
-B | Ballerina, Base Makefile, Bash, Batchfile, BibTeX, BlitzBasic, BNF, Brainfuck
+B | Ballerina, Base Makefile, Bash, Batchfile, BlitzBasic, BNF, Brainfuck
-C | C, C#, C++, Caddyfile, Caddyfile Directives, Cap'n Proto, Cassandra CQL, Ceylon, CFEngine3, cfstatement, ChaiScript, Cheetah, Clojure, CMake, COBOL, CoffeeScript, Common Lisp, Coq, Crystal, CSS, Cython
+C | C, C#, C++, Cap'n Proto, Cassandra CQL, Ceylon, CFEngine3, cfstatement, ChaiScript, Cheetah, Clojure, CMake, COBOL, CoffeeScript, Common Lisp, Coq, Crystal, CSS, Cython
 D | D, Dart, Diff, Django/Jinja, Docker, DTD
 E | EBNF, Elixir, Elm, EmacsLisp, Erlang
 F | Factor, Fish, Forth, Fortran, FSharp
-G | GAS, GDScript, Genshi, Genshi HTML, Genshi Text, Gherkin, GLSL, Gnuplot, Go, Go HTML Template, Go Text Template, GraphQL, Groovy
+G | GAS, GDScript, Genshi, Genshi HTML, Genshi Text, GLSL, Gnuplot, Go, Go HTML Template, Go Text Template, GraphQL, Groovy
-H | Handlebars, Haskell, Haxe, HCL, Hexdump, HLB, HTML, HTTP, Hy
+H | Handlebars, Haskell, Haxe, HCL, Hexdump, HTML, HTTP, Hy
-I | Idris, Igor, INI, Io
+I | Idris, INI, Io
 J | J, Java, JavaScript, JSON, Julia, Jungle
 K | Kotlin
 L | Lighttpd configuration file, LLVM, Lua
 M | Mako, markdown, Mason, Mathematica, Matlab, MiniZinc, MLIR, Modula-2, MonkeyC, MorrowindScript, Myghty, MySQL
 N | NASM, Newspeak, Nginx configuration file, Nim, Nix
 O | Objective-C, OCaml, Octave, OpenSCAD, Org Mode
-P | PacmanConf, Perl, PHP, PHTML, Pig, PkgConfig, PL/pgSQL, plaintext, Pony, PostgreSQL SQL dialect, PostScript, POVRay, PowerShell, Prolog, PromQL, Protocol Buffer, Puppet, Python, Python 3
+P | PacmanConf, Perl, PHP, Pig, PkgConfig, PL/pgSQL, plaintext, PostgreSQL SQL dialect, PostScript, POVRay, PowerShell, Prolog, Protocol Buffer, Puppet, Python, Python 3
 Q | QBasic
-R | R, Racket, Ragel, react, ReasonML, reg, reStructuredText, Rexx, Ruby, Rust
+R | R, Racket, Ragel, react, reg, reStructuredText, Rexx, Ruby, Rust
-S | SAS, Sass, Scala, Scheme, Scilab, SCSS, Smalltalk, Smarty, Snobol, Solidity, SPARQL, SQL, SquidConf, Standard ML, Stylus, Swift, SYSTEMD, systemverilog
+S | Sass, Scala, Scheme, Scilab, SCSS, Smalltalk, Smarty, SML, Snobol, Solidity, SPARQL, SQL, SquidConf, Swift, SYSTEMD, systemverilog
 T | TableGen, TASM, Tcl, Tcsh, Termcap, Terminfo, Terraform, TeX, Thrift, TOML, TradingView, Transact-SQL, Turing, Turtle, Twig, TypeScript, TypoScript, TypoScriptCssData, TypoScriptHtmlData
 V | VB.net, verilog, VHDL, VimL, vue
 W | WDTE
 X | XML, Xorg
-Y | YAML, YANG
+Y | YAML
-Z | Zig
 
 
 _I will attempt to keep this section up to date, but an authoritative list can be
@@ -184,7 +183,7 @@ following constructor options:
 - `ClassPrefix(prefix)` - prefix each generated CSS class.
 - `TabWidth(width)` - Set the rendered tab width, in characters.
 - `WithLineNumbers()` - Render line numbers (style with `LineNumbers`).
-- `LinkableLineNumbers()` - Make the line numbers linkable and be a link to themselves.
+- `LinkableLineNumbers()` - Make the line numbers linkable.
 - `HighlightLines(ranges)` - Highlight lines in these ranges (style with `LineHighlight`).
 - `LineNumbersInTable()` - Use a table for formatting line numbers and code, rather than spans.
 

vendor/github.com/alecthomas/chroma/formatters/html/html.go

@@ -211,7 +211,7 @@ func (f *Formatter) writeHTML(w io.Writer, style *chroma.Style, tokens []chroma.
 				fmt.Fprintf(w, "<span%s>", f.styleAttr(css, chroma.LineHighlight))
 			}
 
-			fmt.Fprintf(w, "<span%s%s>%s\n</span>", f.styleAttr(css, chroma.LineNumbersTable), f.lineIDAttribute(line), f.lineTitleWithLinkIfNeeded(lineDigits, line))
+			fmt.Fprintf(w, "<span%s%s>%*d\n</span>", f.styleAttr(css, chroma.LineNumbersTable), f.lineIDAttribute(line), lineDigits, line)
 
 			if highlight {
 				fmt.Fprintf(w, "</span>")
@@ -237,7 +237,7 @@ func (f *Formatter) writeHTML(w io.Writer, style *chroma.Style, tokens []chroma.
 		}
 
 		if f.lineNumbers && !wrapInTable {
-			fmt.Fprintf(w, "<span%s%s>%s</span>", f.styleAttr(css, chroma.LineNumbers), f.lineIDAttribute(line), f.lineTitleWithLinkIfNeeded(lineDigits, line))
+			fmt.Fprintf(w, "<span%s%s>%*d</span>", f.styleAttr(css, chroma.LineNumbers), f.lineIDAttribute(line), lineDigits, line)
 		}
 
 		for _, token := range tokens {
@@ -272,19 +272,7 @@ func (f *Formatter) lineIDAttribute(line int) string {
 	if !f.linkableLineNumbers {
 		return ""
 	}
-	return fmt.Sprintf(" id=\"%s\"", f.lineID(line))
+	return fmt.Sprintf(" id=\"%s%d\"", f.lineNumbersIDPrefix, line)
-}
-
-func (f *Formatter) lineTitleWithLinkIfNeeded(lineDigits, line int) string {
-	title := fmt.Sprintf("%*d", lineDigits, line)
-	if !f.linkableLineNumbers {
-		return title
-	}
-	return fmt.Sprintf("<a style=\"outline: none; text-decoration:none; color:inherit\" href=\"#%s\">%s</a>", f.lineID(line), title)
-}
-
-func (f *Formatter) lineID(line int) string {
-	return fmt.Sprintf("%s%d", f.lineNumbersIDPrefix, line)
 }
 
 func (f *Formatter) shouldHighlight(highlightIndex, line int) (bool, bool) {

vendor/github.com/alecthomas/chroma/lexers/a/awk.go

@@ -30,14 +30,14 @@ var Awk = internal.Register(MustNewLexer(
 		"root": {
 			{`^(?=\s|/)`, Text, Push("slashstartsregex")},
 			Include("commentsandwhitespace"),
-			{`\+\+|--|\|\||&&|in\b|\$|!?~|\|&|(\*\*|[-<>+*%\^/!=|])=?`, Operator, Push("slashstartsregex")},
+			{`\+\+|--|\|\||&&|in\b|\$|!?~|(\*\*|[-<>+*%\^/!=|])=?`, Operator, Push("slashstartsregex")},
 			{`[{(\[;,]`, Punctuation, Push("slashstartsregex")},
 			{`[})\].]`, Punctuation, nil},
-			{`(break|continue|do|while|exit|for|if|else|return|switch|case|default)\b`, Keyword, Push("slashstartsregex")},
+			{`(break|continue|do|while|exit|for|if|else|return)\b`, Keyword, Push("slashstartsregex")},
 			{`function\b`, KeywordDeclaration, Push("slashstartsregex")},
-			{`(atan2|cos|exp|int|log|rand|sin|sqrt|srand|gensub|gsub|index|length|match|split|patsplit|sprintf|sub|substr|tolower|toupper|close|fflush|getline|next(file)|print|printf|strftime|systime|mktime|delete|system|strtonum|and|compl|lshift|or|rshift|asorti?|isarray|bindtextdomain|dcn?gettext|@(include|load|namespace))\b`, KeywordReserved, nil},
+			{`(atan2|cos|exp|int|log|rand|sin|sqrt|srand|gensub|gsub|index|length|match|split|sprintf|sub|substr|tolower|toupper|close|fflush|getline|next|nextfile|print|printf|strftime|systime|delete|system)\b`, KeywordReserved, nil},
-			{`(ARGC|ARGIND|ARGV|BEGIN(FILE)?|BINMODE|CONVFMT|ENVIRON|END(FILE)?|ERRNO|FIELDWIDTHS|FILENAME|FNR|FPAT|FS|IGNORECASE|LINT|NF|NR|OFMT|OFS|ORS|PROCINFO|RLENGTH|RS|RSTART|RT|SUBSEP|TEXTDOMAIN)\b`, NameBuiltin, nil},
+			{`(ARGC|ARGIND|ARGV|BEGIN|CONVFMT|ENVIRON|END|ERRNO|FIELDWIDTHS|FILENAME|FNR|FS|IGNORECASE|NF|NR|OFMT|OFS|ORFS|RLENGTH|RS|RSTART|RT|SUBSEP)\b`, NameBuiltin, nil},
-			{`[@$a-zA-Z_]\w*`, NameOther, nil},
+			{`[$a-zA-Z_]\w*`, NameOther, nil},
 			{`[0-9][0-9]*\.[0-9]+([eE][0-9]+)?[fd]?`, LiteralNumberFloat, nil},
 			{`0x[0-9a-fA-F]+`, LiteralNumberHex, nil},
 			{`[0-9]+`, LiteralNumberInteger, nil},

vendor/github.com/alecthomas/chroma/lexers/b/bash.go

@@ -14,7 +14,7 @@ var Bash = internal.Register(MustNewLexer(
 	&Config{
 		Name:      "Bash",
 		Aliases:   []string{"bash", "sh", "ksh", "zsh", "shell"},
-		Filenames: []string{"*.sh", "*.ksh", "*.bash", "*.ebuild", "*.eclass", ".env", "*.env", "*.exheres-0", "*.exlib", "*.zsh", "*.zshrc", ".bashrc", "bashrc", ".bash_*", "bash_*", "zshrc", ".zshrc", "PKGBUILD"},
+		Filenames: []string{"*.sh", "*.ksh", "*.bash", "*.ebuild", "*.eclass", "*.exheres-0", "*.exlib", "*.zsh", "*.zshrc", ".bashrc", "bashrc", ".bash_*", "bash_*", "zshrc", ".zshrc", "PKGBUILD"},
 		MimeTypes: []string{"application/x-sh", "application/x-shellscript"},
 	},
 	Rules{

vendor/github.com/alecthomas/chroma/lexers/e/elixir.go

@@ -28,13 +28,6 @@ var Elixir = internal.Register(MustNewLexer(
 			{`:"`, LiteralStringSymbol, Push("string_double_atom")},
 			{`:'`, LiteralStringSymbol, Push("string_single_atom")},
 			{`((?:\.\.\.|<<>>|%\{\}|%|\{\})|(?:(?:\.\.\.|[a-z_]\w*[!?]?)|[A-Z]\w*(?:\.[A-Z]\w*)*|(?:\<\<\<|\>\>\>|\|\|\||\&\&\&|\^\^\^|\~\~\~|\=\=\=|\!\=\=|\~\>\>|\<\~\>|\|\~\>|\<\|\>|\=\=|\!\=|\<\=|\>\=|\&\&|\|\||\<\>|\+\+|\-\-|\|\>|\=\~|\-\>|\<\-|\||\.|\=|\~\>|\<\~|\<|\>|\+|\-|\*|\/|\!|\^|\&)))(:)(?=\s|\n)`, ByGroups(LiteralStringSymbol, Punctuation), nil},
-			{`(fn|do|end|after|else|rescue|catch)\b`, Keyword, nil},
-			{`(not|and|or|when|in)\b`, OperatorWord, nil},
-			{`(case|cond|for|if|unless|try|receive|raise|quote|unquote|unquote_splicing|throw|super|while)\b`, Keyword, nil},
-			{`(def|defp|defmodule|defprotocol|defmacro|defmacrop|defdelegate|defexception|defstruct|defimpl|defcallback)\b`, KeywordDeclaration, nil},
-			{`(import|require|use|alias)\b`, KeywordNamespace, nil},
-			{`(nil|true|false)\b`, NameConstant, nil},
-			{`(_|__MODULE__|__DIR__|__ENV__|__CALLER__)\b`, NamePseudo, nil},
 			{`@(?:\.\.\.|[a-z_]\w*[!?]?)`, NameAttribute, nil},
 			{`(?:\.\.\.|[a-z_]\w*[!?]?)`, Name, nil},
 			{`(%?)([A-Z]\w*(?:\.[A-Z]\w*)*)`, ByGroups(Punctuation, NameClass), nil},

vendor/github.com/alecthomas/chroma/lexers/g/go.go

@@ -60,13 +60,13 @@ var Go = internal.Register(MustNewLexer(
 
 var goTemplateRules = Rules{
 	"root": {
-		{`{{(- )?/\*(.|\n)*?\*/( -)?}}`, CommentMultiline, nil},
 		{`{{[-]?`, CommentPreproc, Push("template")},
 		{`[^{]+`, Other, nil},
 		{`{`, Other, nil},
 	},
 	"template": {
 		{`[-]?}}`, CommentPreproc, Pop(1)},
+		{`/\*.*?\*/`, Comment, nil},
 		{`(?=}})`, CommentPreproc, Pop(1)}, // Terminate the pipeline
 		{`\(`, Operator, Push("subexpression")},
 		{`"(\\\\|\\"|[^"])*"`, LiteralString, nil},
@@ -80,19 +80,19 @@ var goTemplateRules = Rules{
 		{`\s+`, Whitespace, nil},
 		{`\(`, Operator, Push("subexpression")},
 		{`(range|if|else|while|with|template|end|true|false|nil|and|call|html|index|js|len|not|or|print|printf|println|urlquery|eq|ne|lt|le|gt|ge)\b`, Keyword, nil},
-		{`\||:?=|,`, Operator, nil},
+		{`\||:=`, Operator, nil},
 		{`[$]?[^\W\d]\w*`, NameOther, nil},
 		{`[$]?\.(?:[^\W\d]\w*)?`, NameAttribute, nil},
 		{`"(\\\\|\\"|[^"])*"`, LiteralString, nil},
-		{`-?\d+i`, LiteralNumber, nil},
+		{`\d+i`, LiteralNumber, nil},
-		{`-?\d+\.\d*([Ee][-+]\d+)?i`, LiteralNumber, nil},
+		{`\d+\.\d*([Ee][-+]\d+)?i`, LiteralNumber, nil},
 		{`\.\d+([Ee][-+]\d+)?i`, LiteralNumber, nil},
-		{`-?\d+[Ee][-+]\d+i`, LiteralNumber, nil},
+		{`\d+[Ee][-+]\d+i`, LiteralNumber, nil},
-		{`-?\d+(\.\d+[eE][+\-]?\d+|\.\d*|[eE][+\-]?\d+)`, LiteralNumberFloat, nil},
+		{`\d+(\.\d+[eE][+\-]?\d+|\.\d*|[eE][+\-]?\d+)`, LiteralNumberFloat, nil},
-		{`-?\.\d+([eE][+\-]?\d+)?`, LiteralNumberFloat, nil},
+		{`\.\d+([eE][+\-]?\d+)?`, LiteralNumberFloat, nil},
-		{`-?0[0-7]+`, LiteralNumberOct, nil},
+		{`0[0-7]+`, LiteralNumberOct, nil},
-		{`-?0[xX][0-9a-fA-F]+`, LiteralNumberHex, nil},
+		{`0[xX][0-9a-fA-F]+`, LiteralNumberHex, nil},
-		{`-?(0|[1-9][0-9]*)`, LiteralNumberInteger, nil},
+		{`(0|[1-9][0-9]*)`, LiteralNumberInteger, nil},
 		{`'(\\['"\\abfnrtv]|\\x[0-9a-fA-F]{2}|\\[0-7]{1,3}|\\u[0-9a-fA-F]{4}|\\U[0-9a-fA-F]{8}|[^\\])'`, LiteralStringChar, nil},
 		{"`[^`]*`", LiteralString, nil},
 	},

vendor/github.com/alecthomas/chroma/lexers/k/kotlin.go

@@ -24,71 +24,32 @@ var Kotlin = internal.Register(MustNewLexer(
 			{`//[^\n]*\n?`, CommentSingle, nil},
 			{`/[*].*?[*]/`, CommentMultiline, nil},
 			{`\n`, Text, nil},
-			{`!==|!in|!is|===`, Operator, nil},
+			{`::|!!|\?[:.]`, Operator, nil},
-			{`%=|&&|\*=|\+\+|\+=|--|-=|->|\.\.|\/=|::|<=|==|>=|!!|!=|\|\||\?[:.]`, Operator, nil},
+			{`[~!%^&*()+=|\[\]:;,.<>/?-]`, Punctuation, nil},
-			{`[~!%^&*()+=|\[\]:;,.<>\/?-]`, Punctuation, nil},
 			{`[{}]`, Punctuation, nil},
-			{`"""`, LiteralString, Push("rawstring")},
+			{`"""[^"]*"""`, LiteralString, nil},
-			{`"`, LiteralStringDouble, Push("string")},
+			{`"(\\\\|\\"|[^"\n])*["\n]`, LiteralString, nil},
-			{`(')(\\u[0-9a-fA-F]{4})(')`, ByGroups(LiteralStringChar, LiteralStringEscape, LiteralStringChar), nil},
 			{`'\\.'|'[^\\]'`, LiteralStringChar, nil},
 			{`0[xX][0-9a-fA-F]+[Uu]?[Ll]?|[0-9]+(\.[0-9]*)?([eE][+-][0-9]+)?[fF]?[Uu]?[Ll]?`, LiteralNumber, nil},
 			{`(companion)(\s+)(object)`, ByGroups(Keyword, Text, Keyword), nil},
 			{`(class|interface|object)(\s+)`, ByGroups(Keyword, Text), Push("class")},
 			{`(package|import)(\s+)`, ByGroups(Keyword, Text), Push("package")},
 			{`(val|var)(\s+)`, ByGroups(Keyword, Text), Push("property")},
-			{`(fun)(\s+)`, ByGroups(Keyword, Text), Push("function")},
+			{`(fun)(\s+)(<[^>]*>\s+)?`, ByGroups(Keyword, Text, Text), Push("function")},
-			{`(abstract|actual|annotation|as|as\?|break|by|catch|class|companion|const|constructor|continue|crossinline|data|delegate|do|dynamic|else|enum|expect|external|false|field|file|final|finally|for|fun|get|if|import|in|infix|init|inline|inner|interface|internal|is|it|lateinit|noinline|null|object|open|operator|out|override|package|param|private|property|protected|public|receiver|reified|return|sealed|set|setparam|super|suspend|tailrec|this|throw|true|try|typealias|typeof|val|var|vararg|when|where|while)\b`, Keyword, nil},
+			{`(abstract|actual|annotation|as|break|by|catch|class|companion|const|constructor|continue|crossinline|data|do|dynamic|else|enum|expect|external|false|final|finally|for|fun|get|if|import|in|infix|inline|inner|interface|internal|is|lateinit|noinline|null|object|open|operator|out|override|package|private|protected|public|reified|return|sealed|set|super|suspend|tailrec|this|throw|true|try|val|var|vararg|when|where|while)\b`, Keyword, nil},
-			{`@[` + kotlinIdentifier + `]+`, NameDecorator, nil},
+			{"(@?[" + kotlinIdentifier + "]*`)", Name, nil},
-			{`[` + kotlinIdentifier + `]+`, Name, nil},
 		},
 		"package": {
 			{`\S+`, NameNamespace, Pop(1)},
 		},
 		"class": {
-			// \x60 is the back tick character (`)
+			{"(@?[" + kotlinIdentifier + "]*`)", NameClass, Pop(1)},
-			{`\x60[^\x60]+?\x60`, NameClass, Pop(1)},
-			{`[` + kotlinIdentifier + `]+`, NameClass, Pop(1)},
 		},
 		"property": {
-			{`\x60[^\x60]+?\x60`, NameProperty, Pop(1)},
+			{"(@?[" + kotlinIdentifier + " ]*`)", NameProperty, Pop(1)},
-			{`[` + kotlinIdentifier + `]+`, NameProperty, Pop(1)},
-		},
-		"generics-specification": {
-			{`<`, Punctuation, Push("generics-specification")}, // required for generics inside generics e.g. <T : List<Int> >
-			{`>`, Punctuation, Pop(1)},
-			{`[,:*?]`, Punctuation, nil},
-			{`(in|out|reified)`, Keyword, nil},
-			{`\x60[^\x60]+?\x60`, NameClass, nil},
-			{`[` + kotlinIdentifier + `]+`, NameClass, nil},
-			{`\s+`, Text, nil},
 		},
 		"function": {
-			{`<`, Punctuation, Push("generics-specification")},
+			{"(@?[" + kotlinIdentifier + " ]*`)", NameFunction, Pop(1)},
-			{`\x60[^\x60]+?\x60`, NameFunction, Pop(1)},
-			{`[` + kotlinIdentifier + `]+`, NameFunction, Pop(1)},
-			{`\s+`, Text, nil},
-		},
-		"rawstring": {
-			// raw strings don't allow character escaping
-			{`"""`, LiteralString, Pop(1)},
-			{`(?:[^$"]+|\"{1,2}[^"])+`, LiteralString, nil},
-			Include("string-interpol"),
-			// remaining dollar signs are just a string
-			{`\$`, LiteralString, nil},
-		},
-		"string": {
-			{`\\[tbnr'"\\\$]`, LiteralStringEscape, nil},
-			{`\\u[0-9a-fA-F]{4}`, LiteralStringEscape, nil},
-			{`"`, LiteralStringDouble, Pop(1)},
-			Include("string-interpol"),
-			{`[^\n\\"$]+`, LiteralStringDouble, nil},
-			// remaining dollar signs are just a string
-			{`\$`, LiteralStringDouble, nil},
-		},
-		"string-interpol": {
-			{`\$[` + kotlinIdentifier + `]+`, LiteralStringInterpol, nil},
-			{`\${[^}\n]*}`, LiteralStringInterpol, nil},
 		},
 	},
 ))

vendor/github.com/alecthomas/chroma/lexers/p/promql.go

@@ -1,55 +0,0 @@
-package p
-
-import (
-	. "github.com/alecthomas/chroma" // nolint
-	"github.com/alecthomas/chroma/lexers/internal"
-)
-
-// Promql lexer.
-var Promql = internal.Register(MustNewLexer(
-	&Config{
-		Name:      "PromQL",
-		Aliases:   []string{"promql"},
-		Filenames: []string{"*.promql"},
-		MimeTypes: []string{},
-	},
-	Rules{
-		"root": {
-			{`\n`, TextWhitespace, nil},
-			{`\s+`, TextWhitespace, nil},
-			{`,`, Punctuation, nil},
-			{Words(``, `\b`, `bool`, `by`, `group_left`, `group_right`, `ignoring`, `offset`, `on`, `without`), Keyword, nil},
-			{Words(``, `\b`, `sum`, `min`, `max`, `avg`, `group`, `stddev`, `stdvar`, `count`, `count_values`, `bottomk`, `topk`, `quantile`), Keyword, nil},
-			{Words(``, `\b`, `abs`, `absent`, `absent_over_time`, `avg_over_time`, `ceil`, `changes`, `clamp_max`, `clamp_min`, `count_over_time`, `day_of_month`, `day_of_week`, `days_in_month`, `delta`, `deriv`, `exp`, `floor`, `histogram_quantile`, `holt_winters`, `hour`, `idelta`, `increase`, `irate`, `label_join`, `label_replace`, `ln`, `log10`, `log2`, `max_over_time`, `min_over_time`, `minute`, `month`, `predict_linear`, `quantile_over_time`, `rate`, `resets`, `round`, `scalar`, `sort`, `sort_desc`, `sqrt`, `stddev_over_time`, `stdvar_over_time`, `sum_over_time`, `time`, `timestamp`, `vector`, `year`), KeywordReserved, nil},
-			{`[1-9][0-9]*[smhdwy]`, LiteralString, nil},
-			{`-?[0-9]+\.[0-9]+`, LiteralNumberFloat, nil},
-			{`-?[0-9]+`, LiteralNumberInteger, nil},
-			{`#.*?$`, CommentSingle, nil},
-			{`(\+|\-|\*|\/|\%|\^)`, Operator, nil},
-			{`==|!=|>=|<=|<|>`, Operator, nil},
-			{`and|or|unless`, OperatorWord, nil},
-			{`[_a-zA-Z][a-zA-Z0-9_]+`, NameVariable, nil},
-			{`(["\'])(.*?)(["\'])`, ByGroups(Punctuation, LiteralString, Punctuation), nil},
-			{`\(`, Operator, Push("function")},
-			{`\)`, Operator, nil},
-			{`\{`, Punctuation, Push("labels")},
-			{`\[`, Punctuation, Push("range")},
-		},
-		"labels": {
-			{`\}`, Punctuation, Pop(1)},
-			{`\n`, TextWhitespace, nil},
-			{`\s+`, TextWhitespace, nil},
-			{`,`, Punctuation, nil},
-			{`([_a-zA-Z][a-zA-Z0-9_]*?)(\s*?)(=~|!=|=|~!)(\s*?)(")(.*?)(")`, ByGroups(NameLabel, TextWhitespace, Operator, TextWhitespace, Punctuation, LiteralString, Punctuation), nil},
-		},
-		"range": {
-			{`\]`, Punctuation, Pop(1)},
-			{`[1-9][0-9]*[smhdwy]`, LiteralString, nil},
-		},
-		"function": {
-			{`\)`, Operator, Pop(1)},
-			{`\(`, Operator, Push()},
-			Default(Pop(1)),
-		},
-	},
-))

vendor/github.com/alecthomas/chroma/lexers/qml.go

@@ -1,54 +0,0 @@
-package lexers
-
-import (
-	. "github.com/alecthomas/chroma" // nolint
-	"github.com/alecthomas/chroma/lexers/internal"
-)
-
-// Qml lexer.
-var Qml = internal.Register(MustNewLexer(
-	&Config{
-		Name:      "QML",
-		Aliases:   []string{"qml", "qbs"},
-		Filenames: []string{"*.qml", "*.qbs"},
-		MimeTypes: []string{"application/x-qml", "application/x-qt.qbs+qml"},
-		DotAll:    true,
-	},
-	Rules{
-		"commentsandwhitespace": {
-			{`\s+`, Text, nil},
-			{`<!--`, Comment, nil},
-			{`//.*?\n`, CommentSingle, nil},
-			{`/\*.*?\*/`, CommentMultiline, nil},
-		},
-		"slashstartsregex": {
-			Include("commentsandwhitespace"),
-			{`/(\\.|[^[/\\\n]|\[(\\.|[^\]\\\n])*])+/([gim]+\b|\B)`, LiteralStringRegex, Pop(1)},
-			{`(?=/)`, Text, Push("#pop", "badregex")},
-			Default(Pop(1)),
-		},
-		"badregex": {
-			{`\n`, Text, Pop(1)},
-		},
-		"root": {
-			{`^(?=\s|/|<!--)`, Text, Push("slashstartsregex")},
-			Include("commentsandwhitespace"),
-			{`\+\+|--|~|&&|\?|:|\|\||\\(?=\n)|(<<|>>>?|==?|!=?|[-<>+*%&|^/])=?`, Operator, Push("slashstartsregex")},
-			{`[{(\[;,]`, Punctuation, Push("slashstartsregex")},
-			{`[})\].]`, Punctuation, nil},
-			{`\bid\s*:\s*[A-Za-z][\w.]*`, KeywordDeclaration, Push("slashstartsregex")},
-			{`\b[A-Za-z][\w.]*\s*:`, Keyword, Push("slashstartsregex")},
-			{`(for|in|while|do|break|return|continue|switch|case|default|if|else|throw|try|catch|finally|new|delete|typeof|instanceof|void|this)\b`, Keyword, Push("slashstartsregex")},
-			{`(var|let|with|function)\b`, KeywordDeclaration, Push("slashstartsregex")},
-			{`(abstract|boolean|byte|char|class|const|debugger|double|enum|export|extends|final|float|goto|implements|import|int|interface|long|native|package|private|protected|public|short|static|super|synchronized|throws|transient|volatile)\b`, KeywordReserved, nil},
-			{`(true|false|null|NaN|Infinity|undefined)\b`, KeywordConstant, nil},
-			{`(Array|Boolean|Date|Error|Function|Math|netscape|Number|Object|Packages|RegExp|String|sun|decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|Error|eval|isFinite|isNaN|parseFloat|parseInt|document|this|window)\b`, NameBuiltin, nil},
-			{`[$a-zA-Z_]\w*`, NameOther, nil},
-			{`[0-9][0-9]*\.[0-9]+([eE][0-9]+)?[fd]?`, LiteralNumberFloat, nil},
-			{`0x[0-9a-fA-F]+`, LiteralNumberHex, nil},
-			{`[0-9]+`, LiteralNumberInteger, nil},
-			{`"(\\\\|\\"|[^"])*"`, LiteralStringDouble, nil},
-			{`'(\\\\|\\'|[^'])*'`, LiteralStringSingle, nil},
-		},
-	},
-))

vendor/github.com/alecthomas/chroma/lexers/r/rust.go

@@ -28,18 +28,18 @@ var Rust = internal.Register(MustNewLexer(
 			{`/\*\*(\n|[^/*])`, LiteralStringDoc, Push("doccomment")},
 			{`/\*!`, LiteralStringDoc, Push("doccomment")},
 			{`/\*`, CommentMultiline, Push("comment")},
-			{`r#*"(?:\\.|[^\\;])*"#*`, LiteralString, nil},
+			{`r#*"(?:\\.|[^\\\r\n;])*"#*`, LiteralString, nil},
-			{`"(?:\\.|[^\\"])*"`, LiteralString, nil},
+			{`"(?:\\.|[^\\\r\n"])*"`, LiteralString, nil},
 			{`\$([a-zA-Z_]\w*|\(,?|\),?|,?)`, CommentPreproc, nil},
-			{Words(``, `\b`, `as`, `async`, `await`, `const`, `crate`, `else`, `extern`, `for`, `if`, `impl`, `in`, `loop`, `match`, `move`, `mut`, `pub`, `ref`, `return`, `static`, `super`, `trait`, `unsafe`, `use`, `where`, `while`), Keyword, nil},
+			{Words(``, `\b`, `as`, `box`, `const`, `crate`, `else`, `extern`, `for`, `if`, `impl`, `in`, `loop`, `match`, `move`, `mut`, `pub`, `ref`, `return`, `static`, `super`, `trait`, `unsafe`, `use`, `where`, `while`), Keyword, nil},
-			{Words(``, `\b`, `abstract`, `become`, `box`, `do`, `final`, `macro`, `override`, `priv`, `try`, `typeof`, `unsized`, `virtual`, `yield`), KeywordReserved, nil},
+			{Words(``, `\b`, `abstract`, `alignof`, `become`, `do`, `final`, `macro`, `offsetof`, `override`, `priv`, `proc`, `pure`, `sizeof`, `typeof`, `unsized`, `virtual`, `yield`), KeywordReserved, nil},
 			{`(true|false)\b`, KeywordConstant, nil},
 			{`mod\b`, Keyword, Push("modname")},
 			{`let\b`, KeywordDeclaration, nil},
 			{`fn\b`, Keyword, Push("funcname")},
 			{`(struct|enum|type|union)\b`, Keyword, Push("typename")},
 			{`(default)(\s+)(type|fn)\b`, ByGroups(Keyword, Text, Keyword), nil},
-			{Words(``, `\b`, `u8`, `u16`, `u32`, `u64`, `u128`, `i8`, `i16`, `i32`, `i64`, `i128`, `usize`, `isize`, `f32`, `f64`, `str`, `bool`), KeywordType, nil},
+			{Words(``, `\b`, `u8`, `u16`, `u32`, `u64`, `i8`, `i16`, `i32`, `i64`, `usize`, `isize`, `f32`, `f64`, `str`, `bool`), KeywordType, nil},
 			{`self\b`, NameBuiltinPseudo, nil},
 			{Words(``, `\b`, `Copy`, `Send`, `Sized`, `Sync`, `Drop`, `Fn`, `FnMut`, `FnOnce`, `Box`, `ToOwned`, `Clone`, `PartialEq`, `PartialOrd`, `Eq`, `Ord`, `AsRef`, `AsMut`, `Into`, `From`, `Default`, `Iterator`, `Extend`, `IntoIterator`, `DoubleEndedIterator`, `ExactSizeIterator`, `Option`, `Some`, `None`, `Result`, `Ok`, `Err`, `SliceConcatExt`, `String`, `ToString`, `Vec`), NameBuiltin, nil},
 			{`::\b`, Text, nil},

vendor/github.com/alecthomas/chroma/lexers/y/yaml.go

@@ -23,13 +23,13 @@ var YAML = internal.Register(MustNewLexer(
 			{`&[^\s]+`, CommentPreproc, nil},
 			{`\*[^\s]+`, CommentPreproc, nil},
 			{`^%include\s+[^\n\r]+`, CommentPreproc, nil},
+			{`[>|](?:[+-])?\s(?:^(?:[ \n]{1})+.*\n?)*$`, StringDoc, nil},
 			Include("key"),
 			Include("value"),
 			{`[?:,\[\]]`, Punctuation, nil},
 			{`.`, Text, nil},
 		},
 		"value": {
-			{`([>|](?:[+-])?)(\n(^ {1,})(?:.*\n*(?:^\3 *).*)*)`, ByGroups(Punctuation, StringDoc, Whitespace), nil},
 			{Words(``, `\b`, "true", "True", "TRUE", "false", "False", "FALSE", "null",
 				"y", "Y", "yes", "Yes", "YES", "n", "N", "no", "No", "NO",
 				"on", "On", "ON", "off", "Off", "OFF"), KeywordConstant, nil},
@@ -37,7 +37,6 @@ var YAML = internal.Register(MustNewLexer(
 			{`'(?:\\.|[^'])*'`, StringSingle, nil},
 			{`\d\d\d\d-\d\d-\d\d([T ]\d\d:\d\d:\d\d(\.\d+)?(Z|\s+[-+]\d+)?)?`, LiteralDate, nil},
 			{`\b[+\-]?(0x[\da-f]+|0o[0-7]+|(\d+\.?\d*|\.?\d+)(e[\+\-]?\d+)?|\.inf|\.nan)\b`, Number, nil},
-			{`([^\{\}\[\]\?,\:\!\-\*&\@].*)( )+(#.*)`, ByGroups(Literal, Whitespace, Comment), nil},
 			{`[^\{\}\[\]\?,\:\!\-\*&\@].*`, Literal, nil},
 		},
 		"key": {

vendor/github.com/alecthomas/chroma/lexers/z/zig.go

@@ -30,10 +30,10 @@ var Zig = internal.Register(MustNewLexer(
 			{`0x[0-9a-fA-F]+\.?[pP][\-+]?[0-9a-fA-F]+`, LiteralNumberFloat, nil},
 			{`[0-9]+\.[0-9]+([eE][-+]?[0-9]+)?`, LiteralNumberFloat, nil},
 			{`[0-9]+\.?[eE][-+]?[0-9]+`, LiteralNumberFloat, nil},
-			{`0b(?:_?[01])+`, LiteralNumberBin, nil},
+			{`0b[01]+`, LiteralNumberBin, nil},
-			{`0o(?:_?[0-7])+`, LiteralNumberOct, nil},
+			{`0o[0-7]+`, LiteralNumberOct, nil},
-			{`0x(?:_?[0-9a-fA-F])+`, LiteralNumberHex, nil},
+			{`0x[0-9a-fA-F]+`, LiteralNumberHex, nil},
-			{`(?:_?[0-9])+`, LiteralNumberInteger, nil},
+			{`[0-9]+`, LiteralNumberInteger, nil},
 			{`@[a-zA-Z_]\w*`, NameBuiltin, nil},
 			{`[a-zA-Z_]\w*`, Name, nil},
 			{`\'\\\'\'`, LiteralStringEscape, nil},

vendor/github.com/alecthomas/chroma/styles/base16-snazzy.go

@@ -1,81 +0,0 @@
-package styles
-
-import (
-	"github.com/alecthomas/chroma"
-)
-
-// Base16Snazzy style
-var Base16Snazzy = Register(chroma.MustNewStyle("base16-snazzy", chroma.StyleEntries{
-	chroma.Comment:                  "#78787e",
-	chroma.CommentHashbang:          "#78787e",
-	chroma.CommentMultiline:         "#78787e",
-	chroma.CommentPreproc:           "#78787e",
-	chroma.CommentSingle:            "#78787e",
-	chroma.CommentSpecial:           "#78787e",
-	chroma.Generic:                  "#e2e4e5",
-	chroma.GenericDeleted:           "#ff5c57",
-	chroma.GenericEmph:              "#e2e4e5 underline",
-	chroma.GenericError:             "#ff5c57",
-	chroma.GenericHeading:           "#e2e4e5 bold",
-	chroma.GenericInserted:          "#e2e4e5 bold",
-	chroma.GenericOutput:            "#43454f",
-	chroma.GenericPrompt:            "#e2e4e5",
-	chroma.GenericStrong:            "#e2e4e5 italic",
-	chroma.GenericSubheading:        "#e2e4e5 bold",
-	chroma.GenericTraceback:         "#e2e4e5",
-	chroma.GenericUnderline:         "underline",
-	chroma.Error:                    "#ff5c57",
-	chroma.Keyword:                  "#ff6ac1",
-	chroma.KeywordConstant:          "#ff6ac1",
-	chroma.KeywordDeclaration:       "#ff5c57",
-	chroma.KeywordNamespace:         "#ff6ac1",
-	chroma.KeywordPseudo:            "#ff6ac1",
-	chroma.KeywordReserved:          "#ff6ac1",
-	chroma.KeywordType:              "#9aedfe",
-	chroma.Literal:                  "#e2e4e5",
-	chroma.LiteralDate:              "#e2e4e5",
-	chroma.Name:                     "#e2e4e5",
-	chroma.NameAttribute:            "#57c7ff",
-	chroma.NameBuiltin:              "#ff5c57",
-	chroma.NameBuiltinPseudo:        "#e2e4e5",
-	chroma.NameClass:                "#f3f99d",
-	chroma.NameConstant:             "#ff9f43",
-	chroma.NameDecorator:            "#ff9f43",
-	chroma.NameEntity:               "#e2e4e5",
-	chroma.NameException:            "#e2e4e5",
-	chroma.NameFunction:             "#57c7ff",
-	chroma.NameLabel:                "#ff5c57",
-	chroma.NameNamespace:            "#e2e4e5",
-	chroma.NameOther:                "#e2e4e5",
-	chroma.NameTag:                  "#ff6ac1",
-	chroma.NameVariable:             "#ff5c57",
-	chroma.NameVariableClass:        "#ff5c57",
-	chroma.NameVariableGlobal:       "#ff5c57",
-	chroma.NameVariableInstance:     "#ff5c57",
-	chroma.LiteralNumber:            "#ff9f43",
-	chroma.LiteralNumberBin:         "#ff9f43",
-	chroma.LiteralNumberFloat:       "#ff9f43",
-	chroma.LiteralNumberHex:         "#ff9f43",
-	chroma.LiteralNumberInteger:     "#ff9f43",
-	chroma.LiteralNumberIntegerLong: "#ff9f43",
-	chroma.LiteralNumberOct:         "#ff9f43",
-	chroma.Operator:                 "#ff6ac1",
-	chroma.OperatorWord:             "#ff6ac1",
-	chroma.Other:                    "#e2e4e5",
-	chroma.Punctuation:              "#e2e4e5",
-	chroma.LiteralString:            "#5af78e",
-	chroma.LiteralStringBacktick:    "#5af78e",
-	chroma.LiteralStringChar:        "#5af78e",
-	chroma.LiteralStringDoc:         "#5af78e",
-	chroma.LiteralStringDouble:      "#5af78e",
-	chroma.LiteralStringEscape:      "#5af78e",
-	chroma.LiteralStringHeredoc:     "#5af78e",
-	chroma.LiteralStringInterpol:    "#5af78e",
-	chroma.LiteralStringOther:       "#5af78e",
-	chroma.LiteralStringRegex:       "#5af78e",
-	chroma.LiteralStringSingle:      "#5af78e",
-	chroma.LiteralStringSymbol:      "#5af78e",
-	chroma.Text:                     "#e2e4e5",
-	chroma.TextWhitespace:           "#e2e4e5",
-	chroma.Background:               " bg:#282a36",
-}))

vendor/github.com/alecthomas/chroma/table.py

@@ -1,12 +1,8 @@
 #!/usr/bin/env python3
-import re
 from collections import defaultdict
 from subprocess import check_output
 
-README_FILE = "README.md"
+lines = check_output(["go", "run", "./cmd/chroma/main.go", "--list"]).decode('utf-8').splitlines()
-
-
-lines = check_output(["go", "run", "./cmd/chroma/main.go", "--list"]).decode("utf-8").splitlines()
 lines = [line.strip() for line in lines if line.startswith("  ") and not line.startswith("   ")]
 lines = sorted(lines, key=lambda l: l.lower())
 
@@ -15,18 +11,5 @@ table = defaultdict(list)
 for line in lines:
     table[line[0].upper()].append(line)
 
-rows = []
 for key, value in table.items():
-    rows.append("{} | {}".format(key, ", ".join(value)))
+    print("{} | {}".format(key, ', '.join(value)))
-tbody = "\n".join(rows)
-
-with open(README_FILE, "r") as f:
-    content = f.read()
-
-with open(README_FILE, "w") as f:
-    marker = re.compile(r"(?P<start>:----: \\| --------\n).*?(?P<end>\n\n)", re.DOTALL)
-    replacement = r"\g<start>%s\g<end>" % tbody
-    updated_content = marker.sub(replacement, content)
-    f.write(updated_content)
-
-print(tbody)

vendor/github.com/dlclark/regexp2/.travis.yml

@@ -1,5 +1,5 @@
 language: go
 
 go:
-  - 1.9
+  - 1.5
   - tip

vendor/github.com/dlclark/regexp2/README.md

@@ -43,8 +43,8 @@ The __last__ capture is embedded in each group, so `g.String()` will return the
 | Category | regexp | regexp2 |
 | --- | --- | --- |
 | Catastrophic backtracking possible | no, constant execution time guarantees | yes, if your pattern is at risk you can use the `re.MatchTimeout` field |
-| Python-style capture groups `(?P<name>re)` | yes | no (yes in RE2 compat mode) |
+| Python-style capture groups `(P<name>re)` | yes | no |
-| .NET-style capture groups `(?<name>re)` or `(?'name're)` | no | yes |
+| .NET-style capture groups `(<name>re)` or `('name're)` | no | yes |
 | comments `(?#comment)` | no | yes |
 | branch numbering reset `(?\|a\|b)` | no | no |
 | possessive match `(?>re)` | no | yes |
@@ -54,15 +54,14 @@ The __last__ capture is embedded in each group, so `g.String()` will return the
 | negative lookbehind `(?<!re)` | no | yes |
 | back reference `\1` | no | yes |
 | named back reference `\k'name'` | no | yes |
-| named ascii character class `[[:foo:]]`| yes | no (yes in RE2 compat mode) |
+| named ascii character class `[[:foo:]]`| yes | no |
-| conditionals `(?(expr)yes\|no)` | no | yes |
+| conditionals `((expr)yes\|no)` | no | yes |
 
 ## RE2 compatibility mode
 The default behavior of `regexp2` is to match the .NET regexp engine, however the `RE2` option is provided to change the parsing to increase compatibility with RE2.  Using the `RE2` option when compiling a regexp will not take away any features, but will change the following behaviors:
 * add support for named ascii character classes (e.g. `[[:foo:]]`)
 * add support for python-style capture groups (e.g. `(P<name>re)`)
-* change singleline behavior for `$` to only match end of string (like RE2) (see [#24](https://github.com/dlclark/regexp2/issues/24))
+
- 
 ```go
 re := regexp2.MustCompile(`Your RE2-compatible pattern`, regexp2.RE2)
 if isMatch, _ := re.MatchString(`Something to match`); isMatch {

vendor/github.com/dlclark/regexp2/regexp.go

@@ -235,14 +235,17 @@ func (re *Regexp) getRunesAndStart(s string, startAt int) ([]rune, int) {
 		ret[i] = r
 		i++
 	}
-	if startAt == len(s) {
-		runeIdx = i
-	}
 	return ret[:i], runeIdx
 }
 
 func getRunes(s string) []rune {
-	return []rune(s)
+	ret := make([]rune, len(s))
+	i := 0
+	for _, r := range s {
+		ret[i] = r
+		i++
+	}
+	return ret[:i]
 }
 
 // MatchRunes return true if the runes matches the regex

vendor/github.com/dlclark/regexp2/runner.go

@@ -566,22 +566,9 @@ func (r *runner) execute() error {
 			continue
 
 		case syntax.EndZ:
-			rchars := r.rightchars()
+			if r.rightchars() > 1 || r.rightchars() == 1 && r.charAt(r.textPos()) != '\n' {
-			if rchars > 1 {
 				break
 			}
-			// RE2 and EcmaScript define $ as "asserts position at the end of the string"
-			// PCRE/.NET adds "or before the line terminator right at the end of the string (if any)"
-			if (r.re.options & (RE2 | ECMAScript)) != 0 {
-				// RE2/Ecmascript mode
-				if rchars > 0 {
-					break
-				}
-			} else if rchars == 1 && r.charAt(r.textPos()) != '\n' {
-				// "regular" mode
-				break
-			}
-
 			r.advance(0)
 			continue
 
@@ -951,8 +938,8 @@ func (r *runner) advance(i int) {
 }
 
 func (r *runner) goTo(newpos int) {
-	// when branching backward or in place, ensure storage
+	// when branching backward, ensure storage
-	if newpos <= r.codepos {
+	if newpos < r.codepos {
 		r.ensureStorage()
 	}
 

vendor/github.com/dlclark/regexp2/syntax/parser.go

@@ -1250,10 +1250,10 @@ func (p *parser) scanBasicBackslash(scanOnly bool) (*regexNode, error) {
 			return nil, nil
 		}
 
-		if p.isCaptureSlot(capnum) {
+		if p.useOptionE() || p.isCaptureSlot(capnum) {
 			return newRegexNodeM(ntRef, p.options, capnum), nil
 		}
-		if capnum <= 9 && !p.useOptionE() {
+		if capnum <= 9 {
 			return nil, p.getErr(ErrUndefinedBackRef, capnum)
 		}
 
@@ -1648,7 +1648,7 @@ func (p *parser) scanOptions() {
 }
 
 // Scans \ code for escape codes that map to single unicode chars.
-func (p *parser) scanCharEscape() (r rune, err error) {
+func (p *parser) scanCharEscape() (rune, error) {
 
 	ch := p.moveRightGetChar()
 
@@ -1657,22 +1657,16 @@ func (p *parser) scanCharEscape() (r rune, err error) {
 		return p.scanOctal(), nil
 	}
 
-	pos := p.textpos()
-
 	switch ch {
 	case 'x':
 		// support for \x{HEX} syntax from Perl and PCRE
 		if p.charsRight() > 0 && p.rightChar(0) == '{' {
-			if p.useOptionE() {
-				return ch, nil
-			}
 			p.moveRight(1)
 			return p.scanHexUntilBrace()
-		} else {
-			r, err = p.scanHex(2)
 		}
+		return p.scanHex(2)
 	case 'u':
-		r, err = p.scanHex(4)
+		return p.scanHex(4)
 	case 'a':
 		return '\u0007', nil
 	case 'b':
@@ -1690,18 +1684,13 @@ func (p *parser) scanCharEscape() (r rune, err error) {
 	case 'v':
 		return '\u000B', nil
 	case 'c':
-		r, err = p.scanControl()
+		return p.scanControl()
 	default:
 		if !p.useOptionE() && IsWordChar(ch) {
 			return 0, p.getErr(ErrUnrecognizedEscape, string(ch))
 		}
 		return ch, nil
 	}
-	if err != nil && p.useOptionE() {
-		p.textto(pos)
-		return ch, nil
-	}
-	return
 }
 
 // Grabs and converts an ascii control character
@@ -1818,12 +1807,12 @@ func (p *parser) scanOctal() rune {
 	//we know the first char is good because the caller had to check
 	i := 0
 	d := int(p.rightChar(0) - '0')
-	for c > 0 && d <= 7 && d >= 0 {
+	for c > 0 && d <= 7 {
-		if i >= 0x20 && p.useOptionE() {
-			break
-		}
 		i *= 8
 		i += d
+		if p.useOptionE() && i >= 0x20 {
+			break
+		}
 		c--
 
 		p.moveRight(1)

vendor/golang.org/x/sys/internal/unsafeheader/unsafeheader.go

@@ -1,30 +0,0 @@
-// Copyright 2020 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package unsafeheader contains header declarations for the Go runtime's
-// slice and string implementations.
-//
-// This package allows x/sys to use types equivalent to
-// reflect.SliceHeader and reflect.StringHeader without introducing
-// a dependency on the (relatively heavy) "reflect" package.
-package unsafeheader
-
-import (
-	"unsafe"
-)
-
-// Slice is the runtime representation of a slice.
-// It cannot be used safely or portably and its representation may change in a later release.
-type Slice struct {
-	Data unsafe.Pointer
-	Len  int
-	Cap  int
-}
-
-// String is the runtime representation of a string.
-// It cannot be used safely or portably and its representation may change in a later release.
-type String struct {
-	Data unsafe.Pointer
-	Len  int
-}

vendor/golang.org/x/sys/unix/asm_aix_ppc64.s

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build gc
+// +build !gccgo
 
 #include "textflag.h"
 

vendor/golang.org/x/sys/unix/asm_darwin_386.s

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build gc
+// +build !gccgo
 
 #include "textflag.h"
 

vendor/golang.org/x/sys/unix/asm_darwin_amd64.s

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build gc
+// +build !gccgo
 
 #include "textflag.h"
 

vendor/golang.org/x/sys/unix/asm_darwin_arm.s

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build gc
+// +build !gccgo
 // +build arm,darwin
 
 #include "textflag.h"

vendor/golang.org/x/sys/unix/asm_darwin_arm64.s

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build gc
+// +build !gccgo
 // +build arm64,darwin
 
 #include "textflag.h"

vendor/golang.org/x/sys/unix/asm_dragonfly_amd64.s

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build gc
+// +build !gccgo
 
 #include "textflag.h"
 

vendor/golang.org/x/sys/unix/asm_freebsd_386.s

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build gc
+// +build !gccgo
 
 #include "textflag.h"
 

vendor/golang.org/x/sys/unix/asm_freebsd_amd64.s

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build gc
+// +build !gccgo
 
 #include "textflag.h"
 

vendor/golang.org/x/sys/unix/asm_freebsd_arm.s

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build gc
+// +build !gccgo
 
 #include "textflag.h"
 

vendor/golang.org/x/sys/unix/asm_freebsd_arm64.s

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build gc
+// +build !gccgo
 
 #include "textflag.h"
 

vendor/golang.org/x/sys/unix/asm_linux_386.s

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build gc
+// +build !gccgo
 
 #include "textflag.h"
 

vendor/golang.org/x/sys/unix/asm_linux_amd64.s

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build gc
+// +build !gccgo
 
 #include "textflag.h"
 

vendor/golang.org/x/sys/unix/asm_linux_arm.s

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build gc
+// +build !gccgo
 
 #include "textflag.h"
 

vendor/golang.org/x/sys/unix/asm_linux_arm64.s

@@ -4,7 +4,7 @@
 
 // +build linux
 // +build arm64
-// +build gc
+// +build !gccgo
 
 #include "textflag.h"
 

vendor/golang.org/x/sys/unix/asm_linux_mips64x.s

@@ -4,7 +4,7 @@
 
 // +build linux
 // +build mips64 mips64le
-// +build gc
+// +build !gccgo
 
 #include "textflag.h"
 

vendor/golang.org/x/sys/unix/asm_linux_mipsx.s

@@ -4,7 +4,7 @@
 
 // +build linux
 // +build mips mipsle
-// +build gc
+// +build !gccgo
 
 #include "textflag.h"
 

vendor/golang.org/x/sys/unix/asm_linux_ppc64x.s

@@ -4,7 +4,7 @@
 
 // +build linux
 // +build ppc64 ppc64le
-// +build gc
+// +build !gccgo
 
 #include "textflag.h"
 

vendor/golang.org/x/sys/unix/asm_linux_riscv64.s

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build riscv64,gc
+// +build riscv64,!gccgo
 
 #include "textflag.h"
 

vendor/golang.org/x/sys/unix/asm_linux_s390x.s

@@ -4,7 +4,7 @@
 
 // +build s390x
 // +build linux
-// +build gc
+// +build !gccgo
 
 #include "textflag.h"
 

vendor/golang.org/x/sys/unix/asm_netbsd_386.s

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build gc
+// +build !gccgo
 
 #include "textflag.h"
 

vendor/golang.org/x/sys/unix/asm_netbsd_amd64.s

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build gc
+// +build !gccgo
 
 #include "textflag.h"
 

vendor/golang.org/x/sys/unix/asm_netbsd_arm.s

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build gc
+// +build !gccgo
 
 #include "textflag.h"
 

vendor/golang.org/x/sys/unix/asm_netbsd_arm64.s

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build gc
+// +build !gccgo
 
 #include "textflag.h"
 

vendor/golang.org/x/sys/unix/asm_openbsd_386.s

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build gc
+// +build !gccgo
 
 #include "textflag.h"
 

vendor/golang.org/x/sys/unix/asm_openbsd_amd64.s

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build gc
+// +build !gccgo
 
 #include "textflag.h"
 

vendor/golang.org/x/sys/unix/asm_openbsd_arm.s

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build gc
+// +build !gccgo
 
 #include "textflag.h"
 

vendor/golang.org/x/sys/unix/asm_openbsd_arm64.s

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build gc
+// +build !gccgo
 
 #include "textflag.h"
 

vendor/golang.org/x/sys/unix/asm_openbsd_mips64.s

@@ -1,29 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build gc
-
-#include "textflag.h"
-
-//
-// System call support for mips64, OpenBSD
-//
-
-// Just jump to package syscall's implementation for all these functions.
-// The runtime may know about them.
-
-TEXT	·Syscall(SB),NOSPLIT,$0-56
-	JMP	syscall·Syscall(SB)
-
-TEXT	·Syscall6(SB),NOSPLIT,$0-80
-	JMP	syscall·Syscall6(SB)
-
-TEXT	·Syscall9(SB),NOSPLIT,$0-104
-	JMP	syscall·Syscall9(SB)
-
-TEXT	·RawSyscall(SB),NOSPLIT,$0-56
-	JMP	syscall·RawSyscall(SB)
-
-TEXT	·RawSyscall6(SB),NOSPLIT,$0-80
-	JMP	syscall·RawSyscall6(SB)

vendor/golang.org/x/sys/unix/asm_solaris_amd64.s

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build gc
+// +build !gccgo
 
 #include "textflag.h"
 

vendor/golang.org/x/sys/unix/endian_big.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 //
-// +build armbe arm64be m68k mips mips64 mips64p32 ppc ppc64 s390 s390x shbe sparc sparc64
+// +build ppc64 s390x mips mips64
 
 package unix
 

vendor/golang.org/x/sys/unix/endian_little.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 //
-// +build 386 amd64 amd64p32 alpha arm arm64 mipsle mips64le mips64p32le nios2 ppc64le riscv riscv64 sh
+// +build 386 amd64 amd64p32 arm arm64 ppc64le mipsle mips64le riscv64
 
 package unix
 

vendor/golang.org/x/sys/unix/fcntl_darwin.go

@@ -16,9 +16,3 @@ func FcntlFlock(fd uintptr, cmd int, lk *Flock_t) error {
 	_, err := fcntl(int(fd), cmd, int(uintptr(unsafe.Pointer(lk))))
 	return err
 }
-
-// FcntlFstore performs a fcntl syscall for the F_PREALLOCATE command.
-func FcntlFstore(fd uintptr, cmd int, fstore *Fstore_t) error {
-	_, err := fcntl(int(fd), cmd, int(uintptr(unsafe.Pointer(fstore))))
-	return err
-}

vendor/golang.org/x/sys/unix/fcntl_linux_32bit.go

@@ -1,9 +1,9 @@
+// +build linux,386 linux,arm linux,mips linux,mipsle
+
 // Copyright 2014 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build linux,386 linux,arm linux,mips linux,mipsle
-
 package unix
 
 func init() {

vendor/golang.org/x/sys/unix/gccgo.go

@@ -12,8 +12,10 @@ import "syscall"
 // We can't use the gc-syntax .s files for gccgo. On the plus side
 // much of the functionality can be written directly in Go.
 
+//extern gccgoRealSyscallNoError
 func realSyscallNoError(trap, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r uintptr)
 
+//extern gccgoRealSyscall
 func realSyscall(trap, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r, errno uintptr)
 
 func SyscallNoError(trap, a1, a2, a3 uintptr) (r1, r2 uintptr) {

vendor/golang.org/x/sys/unix/gccgo_c.c

@@ -21,9 +21,6 @@ struct ret {
 	uintptr_t err;
 };
 
-struct ret gccgoRealSyscall(uintptr_t trap, uintptr_t a1, uintptr_t a2, uintptr_t a3, uintptr_t a4, uintptr_t a5, uintptr_t a6, uintptr_t a7, uintptr_t a8, uintptr_t a9)
-  __asm__(GOSYM_PREFIX GOPKGPATH ".realSyscall");
-
 struct ret
 gccgoRealSyscall(uintptr_t trap, uintptr_t a1, uintptr_t a2, uintptr_t a3, uintptr_t a4, uintptr_t a5, uintptr_t a6, uintptr_t a7, uintptr_t a8, uintptr_t a9)
 {
@@ -35,9 +32,6 @@ gccgoRealSyscall(uintptr_t trap, uintptr_t a1, uintptr_t a2, uintptr_t a3, uintp
 	return r;
 }
 
-uintptr_t gccgoRealSyscallNoError(uintptr_t trap, uintptr_t a1, uintptr_t a2, uintptr_t a3, uintptr_t a4, uintptr_t a5, uintptr_t a6, uintptr_t a7, uintptr_t a8, uintptr_t a9)
-  __asm__(GOSYM_PREFIX GOPKGPATH ".realSyscallNoError");
-
 uintptr_t
 gccgoRealSyscallNoError(uintptr_t trap, uintptr_t a1, uintptr_t a2, uintptr_t a3, uintptr_t a4, uintptr_t a5, uintptr_t a6, uintptr_t a7, uintptr_t a8, uintptr_t a9)
 {