diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 7f89891..ffd15fd 100644
--- a/.github/workflows/ci.yaml
+++ b/.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:
diff --git a/README.md b/README.md
index b517410..14f380b 100644
--- a/README.md
+++ b/README.md
@@ -1,20 +1,27 @@
+[](https://marketplace.visualstudio.com/items?itemName=ahmadalli.vscode-nginx-conf)
+
# Nginx config file hint(auto-completion) for VS Code
-[](https://github.com/hangxingliu/vscode-nginx-conf-hint/actions/workflows/ci.yaml)
+[](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: Ctrl+Shift+X or Command+Shift+X)
-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
-
+
## 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
diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
index e79103d..7543390 100644
--- a/docs/CONTRIBUTING.md
+++ b/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
diff --git a/images/icon.png b/images/icon.png
index ccf7f53..a679988 100644
Binary files a/images/icon.png and b/images/icon.png differ
diff --git a/package.json b/package.json
index 4225db8..d4dbde9 100644
--- a/package.json
+++ b/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": {
@@ -53,7 +53,7 @@
"ts-node": "^10.4.0",
"turndown": "^7.1.1",
"typescript": "^4.4.4",
- "webpack": "^5.64.1",
+ "webpack": "^5.76.0",
"webpack-cli": "^4.9.1"
},
"optionalDependencies": {
@@ -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"
}
diff --git a/src/extension/providers/utils.ts b/src/extension/providers/utils.ts
index aebf776..a24b2a6 100644
--- a/src/extension/providers/utils.ts
+++ b/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];
diff --git a/yarn.lock b/yarn.lock
index 1ad1a2d..b7c4ac7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -89,10 +89,10 @@
resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.2.tgz#423c77877d0569db20e1fc80885ac4118314010e"
integrity sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==
-"@types/eslint-scope@^3.7.0":
- version "3.7.1"
- resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.1.tgz#8dc390a7b4f9dd9f1284629efce982e41612116e"
- integrity sha512-SCFeogqiptms4Fg29WpOTk5nHIzfpKCemSN63ksBQYKTcXoJEmJagV+DhVmbapZzY4/5YaOV1nZwrsU79fFm1g==
+"@types/eslint-scope@^3.7.3":
+ version "3.7.4"
+ resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.4.tgz#37fc1223f0786c39627068a12e94d6e6fc61de16"
+ integrity sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==
dependencies:
"@types/eslint" "*"
"@types/estree" "*"
@@ -105,10 +105,10 @@
"@types/estree" "*"
"@types/json-schema" "*"
-"@types/estree@*", "@types/estree@^0.0.50":
- version "0.0.50"
- resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.50.tgz#1e0caa9364d3fccd2931c3ed96fdbeaa5d4cca83"
- integrity sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==
+"@types/estree@*", "@types/estree@^0.0.51":
+ version "0.0.51"
+ resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz#cfd70924a25a3fd32b218e5e420e6897e1ac4f40"
+ integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==
"@types/json-schema@*", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
version "7.0.9"
@@ -358,10 +358,10 @@ acorn-walk@^8.1.1:
resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
-acorn@^8.4.1, acorn@^8.5.0:
- version "8.5.0"
- resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.5.0.tgz#4512ccb99b3698c752591e9bb4472e38ad43cee2"
- integrity sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q==
+acorn@^8.4.1, acorn@^8.5.0, acorn@^8.7.1:
+ version "8.10.0"
+ resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.10.0.tgz#8be5b3907a67221a81ab23c7889c4c5526b62ec5"
+ integrity sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==
agent-base@6:
version "6.0.2"
@@ -677,10 +677,10 @@ electron-to-chromium@^1.3.896:
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.898.tgz#0bd4090bf7c7003cb9bd31c4223a9f6aa1aab9dc"
integrity sha512-dxEsaHy9Ter268LO7P8uWomuChbyML4zZk5F9+UZSozFRS7ggC5cQ8fPIM8Pec+6uWGdujuDagQhIbqjohUK2w==
-enhanced-resolve@^5.0.0, enhanced-resolve@^5.8.3:
- version "5.8.3"
- resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.8.3.tgz#6d552d465cce0423f5b3d718511ea53826a7b2f0"
- integrity sha512-EGAbGvH7j7Xt2nc0E7D99La1OiEs8LnyimkRgwExpUMScN6O+3x9tIWs7PLQZVNx4YD+00skHXPXi1yQHpAmZA==
+enhanced-resolve@^5.0.0, enhanced-resolve@^5.10.0:
+ version "5.15.0"
+ resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz#1af946c7d93603eb88e9896cee4904dc012e9c35"
+ integrity sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==
dependencies:
graceful-fs "^4.2.4"
tapable "^2.2.0"
@@ -1000,10 +1000,10 @@ globby@^11.0.4:
merge2 "^1.3.0"
slash "^3.0.0"
-graceful-fs@^4.1.2, graceful-fs@^4.2.4:
- version "4.2.8"
- resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a"
- integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==
+graceful-fs@^4.1.2, graceful-fs@^4.2.4, graceful-fs@^4.2.9:
+ version "4.2.11"
+ resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
+ integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
has-flag@^4.0.0:
version "4.0.0"
@@ -1169,10 +1169,10 @@ js-yaml@^4.1.0:
dependencies:
argparse "^2.0.1"
-json-parse-better-errors@^1.0.2:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
- integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
+json-parse-even-better-errors@^2.3.1:
+ version "2.3.1"
+ resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
+ integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
json-schema-traverse@^0.4.1:
version "0.4.1"
@@ -1754,10 +1754,10 @@ v8-compile-cache@^2.0.3:
resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
-watchpack@^2.2.0:
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.2.0.tgz#47d78f5415fe550ecd740f99fe2882323a58b1ce"
- integrity sha512-up4YAn/XHgZHIxFBVCdlMiWDj6WaLKpwVeGQk2I5thdYxF/KmF0aaz6TfJZ/hfl1h/XlcDr7k1KH7ThDagpFaA==
+watchpack@^2.4.0:
+ version "2.4.0"
+ resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d"
+ integrity sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==
dependencies:
glob-to-regexp "^0.4.1"
graceful-fs "^4.1.2"
@@ -1788,40 +1788,40 @@ webpack-merge@^5.7.3:
clone-deep "^4.0.1"
wildcard "^2.0.0"
-webpack-sources@^3.2.2:
- version "3.2.2"
- resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.2.tgz#d88e3741833efec57c4c789b6010db9977545260"
- integrity sha512-cp5qdmHnu5T8wRg2G3vZZHoJPN14aqQ89SyQ11NpGH5zEMDCclt49rzo+MaRazk7/UeILhAI+/sEtcM+7Fr0nw==
+webpack-sources@^3.2.3:
+ version "3.2.3"
+ resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
+ integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
-webpack@^5.64.1:
- version "5.64.1"
- resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.64.1.tgz#fd59840c16f04fe315f2b2598a85026f12dfa1bb"
- integrity sha512-b4FHmRgaaAjP+aVOVz41a9Qa5SmkUPQ+u8FntTQ1roPHahSComB6rXnLwc976VhUY4CqTaLu5mCswuHiNhOfVw==
+webpack@^5.76.0:
+ version "5.76.0"
+ resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.76.0.tgz#f9fb9fb8c4a7dbdcd0d56a98e56b8a942ee2692c"
+ integrity sha512-l5sOdYBDunyf72HW8dF23rFtWq/7Zgvt/9ftMof71E/yUb1YLOBmTgA2K4vQthB3kotMrSj609txVE0dnr2fjA==
dependencies:
- "@types/eslint-scope" "^3.7.0"
- "@types/estree" "^0.0.50"
+ "@types/eslint-scope" "^3.7.3"
+ "@types/estree" "^0.0.51"
"@webassemblyjs/ast" "1.11.1"
"@webassemblyjs/wasm-edit" "1.11.1"
"@webassemblyjs/wasm-parser" "1.11.1"
- acorn "^8.4.1"
+ acorn "^8.7.1"
acorn-import-assertions "^1.7.6"
browserslist "^4.14.5"
chrome-trace-event "^1.0.2"
- enhanced-resolve "^5.8.3"
+ enhanced-resolve "^5.10.0"
es-module-lexer "^0.9.0"
eslint-scope "5.1.1"
events "^3.2.0"
glob-to-regexp "^0.4.1"
- graceful-fs "^4.2.4"
- json-parse-better-errors "^1.0.2"
+ graceful-fs "^4.2.9"
+ json-parse-even-better-errors "^2.3.1"
loader-runner "^4.2.0"
mime-types "^2.1.27"
neo-async "^2.6.2"
schema-utils "^3.1.0"
tapable "^2.1.1"
terser-webpack-plugin "^5.1.3"
- watchpack "^2.2.0"
- webpack-sources "^3.2.2"
+ watchpack "^2.4.0"
+ webpack-sources "^3.2.3"
which@^2.0.1:
version "2.0.2"