Bump minimatch from 3.0.4 to 3.1.2

.github/workflows/ci.yaml

@@ -1,9 +1,9 @@
 name: build-artifact
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 jobs:

README.md

@@ -1,20 +1,27 @@
+[![Visual Studio Marketplace Downloads](https://img.shields.io/visual-studio-marketplace/d/ahmadalli.vscode-nginx-conf)](https://marketplace.visualstudio.com/items?itemName=ahmadalli.vscode-nginx-conf)
+
 # Nginx config file hint(auto-completion) for VS Code
 
-[![.github/workflows/ci.yaml](https://github.com/hangxingliu/vscode-nginx-conf-hint/actions/workflows/ci.yaml/badge.svg)](https://github.com/hangxingliu/vscode-nginx-conf-hint/actions/workflows/ci.yaml)
+[![.github/workflows/ci.yaml](https://github.com/ahmadalli/vscode-nginx-conf-hint/actions/workflows/ci.yaml/badge.svg)](https://github.com/ahmadalli/vscode-nginx-conf-hint/actions/workflows/ci.yaml)
 
 
 A Visual Studio Code extension that helps you write Nginx configuration files. 
 Many features in it include syntax highlight, auto-complete, in-editor documents, embedded Lua block, and more.
 
 
+# Why Fork?
+
+The [upstream repo][upstream-repo] seems to be left unmaintained and there was compatibility issue with `raynigon.nginx-formatter` extension because the upstream projects used `NGINX` as language id while the formatter extension uses `nginx` and therefore it's not possible to use both extensions on the same file
+
 ## Installation
 
 1. Click `Extension` button in left side of VSCode. (Shortcut: <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>X</kbd> or <kbd>Command</kbd>+<kbd>Shift</kbd>+<kbd>X</kbd>)
-2. Search for `hangxingliu.vscode-nginx-conf-hint` and click the `Install` button.
+1. Search for `ahmadalli.vscode-nginx-conf` and click the `Install` button.
+1. Reload VSCode.
 
 ## Screenshots
 
-![screenshots](https://raw.githubusercontent.com/hangxingliu/vscode-nginx-conf-hint/master/images/screenshots.gif)
+![screenshots](https://raw.githubusercontent.com/ahmadalli/vscode-nginx-conf/main/images/screenshots.gif)
 
 ## Features
 
@@ -66,18 +73,20 @@ Many features in it include syntax highlight, auto-complete, in-editor documents
 
 ## Author
 
-[LiuYue(hangxingliu)](https://github.com/hangxingliu)
+[LiuYue(hangxingliu)](https://github.com/hangxingliu): Author of the [Original Project][upstream-repo]
+
+[ahmadali shafiee](https://github.com/ahmadalli)
 
 ## Contributor
 
-- [@tiansin](https://github.com/tiansin)
-- [@latipun7](https://github.com/latipun7)
+- [@tiansin](https://github.com/tiansin): Contributor of the [Original Project][upstream-repo]
+- [@latipun7](https://github.com/latipun7): Contributor of the [Original Project][upstream-repo]
 
 
 [nginx-doc]: https://nginx.org/en/docs/
-[doc-script]: https://github.com/hangxingliu/vscode-nginx-conf-hint/blob/master/utils/download_hint_data.js
-[icon-nginx]: https://github.com/shanoor/vscode-nginx/blob/master/nginx_logo.png
-[issues]: https://github.com/hangxingliu/vscode-nginx-conf-hint/issues
-[pr]: https://github.com/hangxingliu/vscode-nginx-conf-hint/pulls
-[changelog]: https://github.com/hangxingliu/vscode-nginx-conf-hint/blob/master/docs/CHANGELOG.md
-[paypal]: https://www.paypal.me/hangxingliu
+[doc-script]: https://github.com/ahmadalli/vscode-nginx-conf-hint/blob/main/utils/download_hint_data.js
+[icon-nginx]: https://github.com/shanoor/vscode-nginx/blob/main/nginx_logo.png
+[issues]: https://github.com/ahmadalli/vscode-nginx-conf/issues
+[pr]: https://github.com/ahmadalli/vscode-nginx-conf/pulls
+[changelog]: https://github.com/ahmadalli/vscode-nginx-conf/blob/main/docs/CHANGELOG.md
+[upstream-repo]: https://github.com/hangxingliu/vscode-nginx-conf-hint

docs/CONTRIBUTING.md

@@ -11,5 +11,5 @@ Remember `npm install` if you want to rebuilding hint data or developing extensi
 
 @todo
 
-[issues]: https://github.com/hangxingliu/vscode-nginx-conf-hint/issues
-[pr]: https://github.com/hangxingliu/vscode-nginx-conf-hint/pulls
+[issues]: https://github.com/ahmadalli/vscode-nginx-conf-hint/issues
+[pr]: https://github.com/ahmadalli/vscode-nginx-conf-hint/pulls

package.json

@@ -1,8 +1,8 @@
 {
-	"name": "vscode-nginx-conf-hint",
-	"displayName": "nginx.conf hint",
+	"name": "vscode-nginx-conf",
+	"displayName": "NGINX Configuration Language Support",
 	"description": "Nginx configuration helper for Visual Studio Code with many features including syntax highlight, auto-complete, in-editor documents, embedded Lua block, and more",
-	"version": "0.3.0",
+	"version": "0.3.1",
 	"license": "GPL-3.0",
 	"icon": "images/icon.png",
 	"galleryBanner": {
@@ -20,8 +20,8 @@
 		"Configuration",
 		"Auto-completion"
 	],
-	"publisher": "hangxingliu",
-	"author": "hangxingliu",
+	"publisher": "ahmadalli",
+	"author": "ahmadalli",
 	"main": "./src/extension/main.desktop.js",
 	"browser": "./artifacts/web-ext/extension.js",
 	"scripts": {
@@ -65,29 +65,35 @@
 		"vscode": "^1.1.0"
 	},
 	"activationEvents": [
-		"onLanguage:NGINX",
+		"onLanguage:nginx",
 		"onLanguage:lua"
 	],
 	"contributes": {
 		"languages": [
 			{
-				"id": "NGINX",
+				"id": "nginx",
 				"aliases": [
-					"NGINX"
+					"NGINX Conf",
+					"NGINX",
+					"nginx"
 				],
 				"extensions": [
 					".conf",
+					".conf.default",
+					".conf.template",
 					"mime.types",
 					"fastcgi_params",
 					"scgi_params",
-					"uwsgi_params"
+					"uwsgi_params",
+					"nginx.conf",
+					".nginx"
 				],
 				"configuration": "./nginx.configuration.json"
 			}
 		],
 		"snippets": [
 			{
-				"language": "NGINX",
+				"language": "nginx",
 				"path": "./assets/snippets/nginx.json"
 			},
 			{
@@ -97,7 +103,7 @@
 		],
 		"grammars": [
 			{
-				"language": "NGINX",
+				"language": "nginx",
 				"scopeName": "source.nginx",
 				"path": "./src/syntax/nginx.tmLanguage",
 				"embeddedLanguages": {
@@ -147,7 +153,7 @@
 		"menus": {
 			"editor/context": [
 				{
-					"when": "!inOutput && resourceLangId == 'NGINX'",
+					"when": "!inOutput && resourceLangId == 'nginx'",
 					"command": "nginx-conf-hint.showDocument",
 					"group": "navigation"
 				}
@@ -156,10 +162,10 @@
 	},
 	"repository": {
 		"type": "git",
-		"url": "https://github.com/hangxingliu/vscode-nginx-conf-hint"
+		"url": "https://github.com/ahmadalli/vscode-nginx-conf"
 	},
 	"bugs": {
-		"url": "https://github.com/hangxingliu/vscode-nginx-conf-hint/issues"
+		"url": "https://github.com/ahmadalli/vscode-nginx-conf/issues"
 	},
-	"homepage": "https://github.com/hangxingliu/vscode-nginx-conf-hint"
+	"homepage": "https://github.com/ahmadalli/vscode-nginx-conf"
 }

src/extension/providers/utils.ts

@@ -1,2 +1,2 @@
-export const NGINX_LANGUAGE_ID = 'NGINX';
+export const NGINX_LANGUAGE_ID = 'nginx';
 export const DOCUMENT_SELECTOR = [NGINX_LANGUAGE_ID];

yarn.lock

@@ -1267,9 +1267,9 @@ mimic-fn@^2.1.0:
   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
 
 minimatch@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
-  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
+  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
   dependencies:
     brace-expansion "^1.1.7"