chore: replace all mentions of the master branch with main

wingrunr21 · wingrunr21 · commit 85c07dd42cdd · 2021-05-30T12:14:56.000-06:00
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -3,7 +3,7 @@ Feel free to open issues or PRs! We welcome all contributions, even from beginne
 ## Prereqs
 
 1. Check out the [VS Code Extension Docs](https://code.visualstudio.com/docs/extensions/overview), especially [Running and Debugging Extensions](https://code.visualstudio.com/docs/extensions/debugging-extensions).
-1. Read the [development docs](https://github.com/rubyide/vscode-ruby/blob/master/docs/developing.md)
+1. Read the [development docs](https://github.com/rubyide/vscode-ruby/blob/main/docs/developing.md)
 
 ## Contributing
 
diff --git a/README.md b/README.md
@@ -1,29 +1,29 @@
 # Visual Studio Code Ruby Extensions
 
 [![CI](https://img.shields.io/github/workflow/status/rubyide/vscode-ruby/CI.svg?logo=github)](https://github.com/rubyide/vscode-ruby/actions?query=workflow%3ACI)
-[![codecov](https://codecov.io/gh/rubyide/vscode-ruby/branch/master/graph/badge.svg)](https://codecov.io/gh/rubyide/vscode-ruby)
+[![codecov](https://codecov.io/gh/rubyide/vscode-ruby/branch/main/graph/badge.svg)](https://codecov.io/gh/rubyide/vscode-ruby)
 
 This is the monorepo for the Visual Studio Code Ruby extensions.
 
-Head on over to the [Ruby extension README](https://github.com/rubyide/vscode-ruby/blob/master/packages/vscode-ruby-client/README.md) to get started!
+Head on over to the [Ruby extension README](https://github.com/rubyide/vscode-ruby/blob/main/packages/vscode-ruby-client/README.md) to get started!
 
 ## Packages
 
-- [`vscode-ruby`](https://github.com/rubyide/vscode-ruby/blob/master/packages/vscode-ruby) - extension providing syntax highlighting, language configuration, and snippets for Ruby
-- [`vscode-ruby-client`](https://github.com/rubyide/vscode-ruby/blob/master/packages/vscode-ruby-client) - extension logic including the language server client
-- [`vscode-ruby-common`](https://github.com/rubyide/vscode-ruby/blob/master/packages/vscode-ruby-common) - common utilities that are shared among several other packages (eg environment detection)
-- [`vscode-ruby-debugger`](https://github.com/rubyide/vscode-ruby/blob/master/packages/vscode-ruby-debugger) - implementation of the debugger
-- [`language-server-ruby`](https://github.com/rubyide/vscode-ruby/blob/master/packages/language-server-ruby) - language server implementation
-  <!-- - [`ruby-debug-ide-protocol`](https://github.com/rubyide/vscode-ruby/blob/master/packages/ruby-debug-ide-protocol) - implementation of the [ruby-debug-ide protocol](https://github.com/ruby-debug/ruby-debug-ide/blob/master/protocol-spec.md)r -->
+- [`vscode-ruby`](https://github.com/rubyide/vscode-ruby/blob/main/packages/vscode-ruby) - extension providing syntax highlighting, language configuration, and snippets for Ruby
+- [`vscode-ruby-client`](https://github.com/rubyide/vscode-ruby/blob/main/packages/vscode-ruby-client) - extension logic including the language server client
+- [`vscode-ruby-common`](https://github.com/rubyide/vscode-ruby/blob/main/packages/vscode-ruby-common) - common utilities that are shared among several other packages (eg environment detection)
+- [`vscode-ruby-debugger`](https://github.com/rubyide/vscode-ruby/blob/main/packages/vscode-ruby-debugger) - implementation of the debugger
+- [`language-server-ruby`](https://github.com/rubyide/vscode-ruby/blob/main/packages/language-server-ruby) - language server implementation
+  <!-- - [`ruby-debug-ide-protocol`](https://github.com/rubyide/vscode-ruby/blob/main/packages/ruby-debug-ide-protocol) - implementation of the [ruby-debug-ide protocol](https://github.com/ruby-debug/ruby-debug-ide/blob/main/protocol-spec.md)r -->
 
 ## Docs
 
-Documentation is available in the [docs](https://github.com/rubyide/vscode-ruby/tree/master/docs) folder
+Documentation is available in the [docs](https://github.com/rubyide/vscode-ruby/tree/main/docs) folder
 
 ## Troubleshooting
 
-Troubleshooting documentation is available [here](https://github.com/rubyide/vscode-ruby/tree/master/docs/troubleshooting.md) folder
+Troubleshooting documentation is available [here](https://github.com/rubyide/vscode-ruby/tree/main/docs/troubleshooting.md) folder
 
 ## Developing
 
-See the [developing](https://github.com/rubyide/vscode-ruby/blob/master/docs/developing.md) docs
+See the [developing](https://github.com/rubyide/vscode-ruby/blob/main/docs/developing.md) docs
diff --git a/docs/debugger.md b/docs/debugger.md
@@ -2,7 +2,7 @@
 
 ## Install Ruby Dependencies
 
-In this extension, we implement [ruby debug ide protocol](https://github.com/ruby-debug/ruby-debug-ide/blob/master/doc/protocol-spec.texi) to allow VS Code to communicate with ruby debug, it requires `ruby-debug-ide` to be installed on your machine. This is also how RubyMine/NetBeans does by default.
+In this extension, we implement [ruby debug ide protocol](https://github.com/ruby-debug/ruby-debug-ide/blob/main/doc/protocol-spec.texi) to allow VS Code to communicate with ruby debug, it requires `ruby-debug-ide` to be installed on your machine. This is also how RubyMine/NetBeans does by default.
 
 - If you are using JRuby or Ruby v1.8.x (`jruby`, `ruby_18`, `mingw_18`), run `gem install ruby-debug-ide`.
 - If you are using Ruby v1.9.x (`ruby_19`, `mingw_19`), run `gem install ruby-debug-ide`. Make sure `ruby-debug-base19x` is installed together with `ruby-debug-ide`.
diff --git a/docs/developing.md b/docs/developing.md
@@ -6,12 +6,12 @@ This repository uses [`lerna`](https://github.com/lerna/lerna) combined with [ya
 
 The overall extension is broken out into several packages within the `packages` directory:
 
-- [`vscode-ruby`](https://github.com/rubyide/vscode-ruby/blob/master/packages/vscode-ruby) - extension providing syntax highlighting, language configuration, and snippets for Ruby
-- [`vscode-ruby-client`](https://github.com/rubyide/vscode-ruby/blob/master/packages/vscode-ruby-client) - extension logic including the language server client
-- [`vscode-ruby-common`](https://github.com/rubyide/vscode-ruby/blob/master/packages/vscode-ruby-common) - common utilities that are shared among several other packages (eg environment detection)
-- [`vscode-ruby-debugger`](https://github.com/rubyide/vscode-ruby/blob/master/packages/vscode-ruby-debugger) - implementation of the debugger
-- [`language-server-ruby`](https://github.com/rubyide/vscode-ruby/blob/master/packages/language-server-ruby) - language server implementation
-  <!-- - [`ruby-debug-ide-protocol`](https://github.com/rubyide/vscode-ruby/blob/master/packages/ruby-debug-ide-protocol) - implementation of the [ruby-debug-ide protocol](https://github.com/ruby-debug/ruby-debug-ide/blob/master/protocol-spec.md) -->
+- [`vscode-ruby`](https://github.com/rubyide/vscode-ruby/blob/main/packages/vscode-ruby) - extension providing syntax highlighting, language configuration, and snippets for Ruby
+- [`vscode-ruby-client`](https://github.com/rubyide/vscode-ruby/blob/main/packages/vscode-ruby-client) - extension logic including the language server client
+- [`vscode-ruby-common`](https://github.com/rubyide/vscode-ruby/blob/main/packages/vscode-ruby-common) - common utilities that are shared among several other packages (eg environment detection)
+- [`vscode-ruby-debugger`](https://github.com/rubyide/vscode-ruby/blob/main/packages/vscode-ruby-debugger) - implementation of the debugger
+- [`language-server-ruby`](https://github.com/rubyide/vscode-ruby/blob/main/packages/language-server-ruby) - language server implementation
+  <!-- - [`ruby-debug-ide-protocol`](https://github.com/rubyide/vscode-ruby/blob/main/packages/ruby-debug-ide-protocol) - implementation of the [ruby-debug-ide protocol](https://github.com/ruby-debug/ruby-debug-ide/blob/main/protocol-spec.md) -->
 
 Each package utilizes `esbuild` or `tsc` to build the `dist` directory.
 
diff --git a/docs/language-server.md b/docs/language-server.md
@@ -38,7 +38,7 @@ Due to limitations in how node's internal `spawn` function works, a shim file ne
 
 ### More Information
 
-The [`vscode-ruby-common`](https://github.com/rubyide/vscode-ruby/blob/master/packages/vscode-ruby-common) package contains the utilities and shims that facilitate this functionality. See [`environment.ts`](https://github.com/rubyide/vscode-ruby/blob/master/packages/vscode-ruby-common/src/environment.ts)
+The [`vscode-ruby-common`](https://github.com/rubyide/vscode-ruby/blob/main/packages/vscode-ruby-common) package contains the utilities and shims that facilitate this functionality. See [`environment.ts`](https://github.com/rubyide/vscode-ruby/blob/main/packages/vscode-ruby-common/src/environment.ts)
 
 ## Logs
 
diff --git a/docs/legacy.md b/docs/legacy.md
@@ -65,7 +65,7 @@ Relevant configuration files:
 - ruby: _none_
 - reek: [\*.reek](https://github.com/troessner/reek)
 - fasterer: [.fasterer.yml](https://github.com/DamirSvrtan/fasterer)
-- ruby-lint: [ruby-lint.yml](https://github.com/YorickPeterse/ruby-lint/blob/master/doc/configuration.md)
+- ruby-lint: [ruby-lint.yml](https://github.com/YorickPeterse/ruby-lint/blob/main/doc/configuration.md)
 - rubocop: [.rubocop.yml](http://rubocop.readthedocs.io/en/latest/configuration/)
 
 Settings available (in your VSCode workspace) for each of the linters:
diff --git a/docs/troubleshooting.md b/docs/troubleshooting.md
@@ -17,7 +17,7 @@ If you believe the extension is incorrectly assigning TextMate Scopes, please fi
 
 ## Environment is incorrectly detected
 
-Please read over the [documentation](https://github.com/rubyide/vscode-ruby/blob/master/docs/language-server.md) on Environment Detection in the language server to ensure you understand its features and limitations.
+Please read over the [documentation](https://github.com/rubyide/vscode-ruby/blob/main/docs/language-server.md) on Environment Detection in the language server to ensure you understand its features and limitations.
 
 ## Linting or Formatting is incorrect
 
diff --git a/packages/language-server-ruby/src/formatters/BaseFormatter.ts b/packages/language-server-ruby/src/formatters/BaseFormatter.ts
@@ -154,7 +154,7 @@ export default abstract class BaseFormatter implements IFormatter {
 		}
 	}
 
-	// Modified from https://github.com/Microsoft/vscode/blob/master/src/vs/editor/common/core/range.ts#L90
+	// Modified from https://github.com/Microsoft/vscode/blob/main/src/vs/editor/common/core/range.ts#L90
 	private checkPositionInRange(position: Position): boolean {
 		const { start, end } = this.range;
 
diff --git a/packages/vscode-ruby-client/README.md b/packages/vscode-ruby-client/README.md
@@ -2,7 +2,7 @@
 
 [![CircleCI](https://img.shields.io/circleci/build/github/rubyide/vscode-ruby?label=circleci&token=c9eaf03305b3fe24e8bc819f3f48060431e8e78f)](https://circleci.com/gh/rubyide/vscode-ruby)
 [![Build status](https://ci.appveyor.com/api/projects/status/vlgs2y7tsc4xpj4c?svg=true)](https://ci.appveyor.com/project/rebornix/vscode-ruby)
-[![codecov](https://codecov.io/gh/rubyide/vscode-ruby/branch/master/graph/badge.svg)](https://codecov.io/gh/rubyide/vscode-ruby)
+[![codecov](https://codecov.io/gh/rubyide/vscode-ruby/branch/main/graph/badge.svg)](https://codecov.io/gh/rubyide/vscode-ruby)
 
 This extension provides enhanced Ruby language and debugging support for Visual Studio Code.
 
@@ -25,7 +25,7 @@ By default, the extension provides sensible defaults for developers to get a bet
 
 ### Using the Language Server
 
-It is **highly recommended** that you enable the Ruby language server (via the Use Language Server setting or `ruby.useLanguageServer` config option). The server does not default to enabled while it is under development but it provides a significantly better experience than the legacy extension functionality. See [docs/language-server.md](https://github.com/rubyide/vscode-ruby/blob/master/docs/language-server.md) for more information on the language server.
+It is **highly recommended** that you enable the Ruby language server (via the Use Language Server setting or `ruby.useLanguageServer` config option). The server does not default to enabled while it is under development but it provides a significantly better experience than the legacy extension functionality. See [docs/language-server.md](https://github.com/rubyide/vscode-ruby/blob/main/docs/language-server.md) for more information on the language server.
 
 Legacy functionality will most likely not receive additional improvements and will be fully removed when the extension hits v1.0
 
@@ -45,21 +45,21 @@ Legacy functionality will most likely not receive additional improvements and wi
 "ruby.format": "rubocop" // use rubocop for formatting
 ```
 
-Reviewing the [linting](https://github.com/rubyide/vscode-ruby/blob/master/docs/linting.md), [formatting](https://github.com/rubyide/vscode-ruby/blob/master/docs/formatting.md), and [environment detection](https://github.com/rubyide/vscode-ruby/blob/master/docs/language-server.md) docs is recommended
+Reviewing the [linting](https://github.com/rubyide/vscode-ruby/blob/main/docs/linting.md), [formatting](https://github.com/rubyide/vscode-ruby/blob/main/docs/formatting.md), and [environment detection](https://github.com/rubyide/vscode-ruby/blob/main/docs/language-server.md) docs is recommended
 
 For full details on configuration options, please take a look at the `Ruby` section in the VS Code settings UI. Each option is associated with a name and description.
 
 ### Debug Configuration
 
-See [docs/debugger.md](https://github.com/rubyide/vscode-ruby/blob/master/docs/debugger.md).
+See [docs/debugger.md](https://github.com/rubyide/vscode-ruby/blob/main/docs/debugger.md).
 
 ### Legacy Configuration
 
-[docs/legacy.md](https://github.com/rubyide/vscode-ruby/blob/master/docs/legacy.md) contains the documentation around the legacy functionality
+[docs/legacy.md](https://github.com/rubyide/vscode-ruby/blob/main/docs/legacy.md) contains the documentation around the legacy functionality
 
 ## Troubleshooting
 
-See [docs/troubleshooting.md](https://github.com/rubyide/vscode-ruby/blob/master/docs/troubleshooting.md)
+See [docs/troubleshooting.md](https://github.com/rubyide/vscode-ruby/blob/main/docs/troubleshooting.md)
 
 ## Other Notable Extensions
 
diff --git a/packages/vscode-ruby-client/src/format/RuboCop.ts b/packages/vscode-ruby-client/src/format/RuboCop.ts
@@ -35,7 +35,7 @@ export class AutoCorrect {
 
 	// What's the exe name for rubocop?
 	get exe(): string[] {
-		const opts:any = this.opts;
+		const opts: any = this.opts;
 		if (opts.exe) {
 			return [opts.exe];
 		}
@@ -90,16 +90,17 @@ export class AutoCorrect {
 
 	private spawn = (args: string[], options?: cp.SpawnOptions): cp.ChildProcess => {
 		const exe: string[] = this.exe;
-		const spawnOpt: cp.SpawnOptions = options ? options : {}
+		const spawnOpt: cp.SpawnOptions = options ? options : {};
 
-		if (!spawnOpt.cwd) { spawnOpt.cwd = vscode.workspace.rootPath }
+		if (!spawnOpt.cwd) {
+			spawnOpt.cwd = vscode.workspace.rootPath;
+		}
 
 		return cp.spawn(exe.shift(), exe.concat(args), spawnOpt);
 	};
 
 	public test(): Promise<any> {
 		return new Promise((resolve, reject) => {
-
 			const rubo = this.spawn(['-v']);
 
 			rubo.on('error', err => {
@@ -172,7 +173,7 @@ export class AutoCorrect {
 					});
 
 					rubo.on('exit', code => {
-						// https://github.com/bbatsov/rubocop/blob/master/manual/basic_usage.md
+						// https://github.com/bbatsov/rubocop/blob/main/manual/basic_usage.md
 						if (code && code !== 1) {
 							vscode.window.showErrorMessage(`rubocop failed with code=${code}`);
 							return reject();
diff --git a/packages/vscode-ruby-client/src/util/env.ts b/packages/vscode-ruby-client/src/util/env.ts
@@ -51,7 +51,7 @@ function getShim(): string {
 }
 
 // Based on the dotenv parse function:
-// https://github.com/motdotla/dotenv/blob/master/lib/main.js#L32
+// https://github.com/motdotla/dotenv/blob/main/lib/main.js#L32
 // modified to not have to deal with Buffers and to handle stuff
 // like export and declare -x at the start of the line
 function processExportLine(line: string): string[] {
diff --git a/packages/vscode-ruby-common/src/environment.ts b/packages/vscode-ruby-common/src/environment.ts
@@ -82,7 +82,7 @@ function getShim(shell: string, shimDir: string): string {
 }
 
 // Based on the dotenv parse function:
-// https://github.com/motdotla/dotenv/blob/master/lib/main.js#L32
+// https://github.com/motdotla/dotenv/blob/main/lib/main.js#L32
 // modified to not have to deal with Buffers and to handle stuff
 // like export and declare -x at the start of the line
 function processExportLine(line: string): string[] {
diff --git a/packages/vscode-ruby/README.md b/packages/vscode-ruby/README.md
@@ -5,10 +5,10 @@ This extension provides improved syntax highlighting, language configuration, an
 ## Syntax Highlighting
 
 Before:
-![syntax_before](https://raw.githubusercontent.com/rubyide/vscode-ruby/master/images/syntax_before.png)
+![syntax_before](https://raw.githubusercontent.com/rubyide/vscode-ruby/main/images/syntax_before.png)
 
 After:
-![syntax_after](https://raw.githubusercontent.com/rubyide/vscode-ruby/master/images/syntax_after.png)
+![syntax_after](https://raw.githubusercontent.com/rubyide/vscode-ruby/main/images/syntax_after.png)
 
 ## Using with the Ruby extension
 
diff --git a/packages/vscode-ruby/syntaxes/gemfile.cson.json b/packages/vscode-ruby/syntaxes/gemfile.cson.json
@@ -1,6 +1,6 @@
 {
 	"information_for_contributors": [
-		"This file has been converted from https://github.com/atom/language-ruby/blob/master/grammars/gemfile.cson",
+		"This file has been converted from https://github.com/atom/language-ruby/blob/main/grammars/gemfile.cson",
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
diff --git a/packages/vscode-ruby/syntaxes/ruby.cson.json b/packages/vscode-ruby/syntaxes/ruby.cson.json
@@ -1,6 +1,6 @@
 {
 	"information_for_contributors": [
-		"This file has been converted from https://github.com/atom/language-ruby/blob/master/grammars/ruby.cson",
+		"This file has been converted from https://github.com/atom/language-ruby/blob/main/grammars/ruby.cson",
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ export default abstract class BaseFormatter implements IFormatter {`
`154`	`154`	`}`
`155`	`155`	`}`
`156`	`156`
`157`		`- // Modified from https://github.com/Microsoft/vscode/blob/master/src/vs/editor/common/core/range.ts#L90`
	`157`	`+ // Modified from https://github.com/Microsoft/vscode/blob/main/src/vs/editor/common/core/range.ts#L90`
`158`	`158`	`private checkPositionInRange(position: Position): boolean {`
`159`	`159`	`const { start, end } = this.range;`
`160`	`160`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ function getShim(): string {`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`// Based on the dotenv parse function:`
`54`		`-// https://github.com/motdotla/dotenv/blob/master/lib/main.js#L32`
	`54`	`+// https://github.com/motdotla/dotenv/blob/main/lib/main.js#L32`
`55`	`55`	`// modified to not have to deal with Buffers and to handle stuff`
`56`	`56`	`// like export and declare -x at the start of the line`
`57`	`57`	`function processExportLine(line: string): string[] {`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ function getShim(shell: string, shimDir: string): string {`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`// Based on the dotenv parse function:`
`85`		`-// https://github.com/motdotla/dotenv/blob/master/lib/main.js#L32`
	`85`	`+// https://github.com/motdotla/dotenv/blob/main/lib/main.js#L32`
`86`	`86`	`// modified to not have to deal with Buffers and to handle stuff`
`87`	`87`	`// like export and declare -x at the start of the line`
`88`	`88`	`function processExportLine(line: string): string[] {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"information_for_contributors": [`
`3`		`- "This file has been converted from https://github.com/atom/language-ruby/blob/master/grammars/gemfile.cson",`
	`3`	`+ "This file has been converted from https://github.com/atom/language-ruby/blob/main/grammars/gemfile.cson",`
`4`	`4`	`"If you want to provide a fix or improvement, please create a pull request against the original repository.",`
`5`	`5`	`"Once accepted there, we are happy to receive an update request."`
`6`	`6`	`],`