Merge branch 'master' of https://github.com/contractshark/vscode-soli…

…dity-extenstion

.github/workflows/nodejs-ci.yml

@@ -2,7 +2,7 @@
 name: nodejs
 on:
   push:
-     paths:
+    paths:
       - "**/**"
       - "!**/*.md/**"
 
@@ -18,8 +18,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: ['14']
-        os: ['ubuntu-latest']
+        node: ["14"]
+        os: ["ubuntu-latest"]
 
     steps:
       - name: Clone repository

.gitignore

@@ -7,9 +7,11 @@ node_modules
 *.tgz
 *.zip
 *.tar
-dist/
 build/
 cache
 .cache/
 *.log
 *-error.
+solidity-lang-*.zip
+*.vsix
+!dist/*.vsix

.prettierrc.json

@@ -4,12 +4,12 @@
   "bracketSpacing": true,
   "jsxBracketSameLine": false,
   "jsxSingleQuote": false,
-  "printWidth": 80,
+  "printWidth": 100,
   "proseWrap": "always",
   "quoteProps": "as-needed",
   "semi": true,
-  "singleQuote": true,
+  "singleQuote": false,
   "tabWidth": 2,
-  "trailingComma": "all",
+  "trailingComma": "es5",
   "useTabs": false
 }

.vscode/extensions.json

@@ -0,0 +1,3 @@
+{
+  "recommendations": ["leodevbro.blockman"]
+}

.vscode/launch.json

@@ -3,15 +3,13 @@
 // Hover to view descriptions of existing attributes.
 // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
 {
-	"version": "0.2.0",
-    "configurations": [
-        {
-            "name": "Extension",
-            "type": "extensionHost",
-            "request": "launch",
-            "args": [
-                "--extensionDevelopmentPath=${workspaceFolder}"
-            ]
-        }
-    ]
-}
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Extension",
+      "type": "extensionHost",
+      "request": "launch",
+      "args": ["--extensionDevelopmentPath=${workspaceFolder}"]
+    }
+  ]
+}

.vscode/settings.json

@@ -1,4 +1,4 @@
 {
-	"files.trimTrailingWhitespace": true,
-	"gitlens.advanced.blame.customArguments": ["--ignore-revs-file", ".gitignore-revs"],
+  "files.trimTrailingWhitespace": true,
+  "gitlens.advanced.blame.customArguments": ["--ignore-revs-file", ".gitignore-revs"]
 }

.vscodeignore

@@ -1,4 +1,13 @@
-.vscode/**
-.vscode-test/**
+.github/**
 .gitignore
-vsc-extension-quickstart.md
+.prettierignore
+.vscode-test/**
+.vscode/**
+.yarnrc
+**/.eslintrc.json
+**/*.map
+**/*.ts
+**/test/*
+**/tsconfig.json
+node_modules
+

LICENSE.txt

@@ -0,0 +1,38 @@
+SPDX-License-Identifier: BSD 3-Clause License
+SPDX-FileCopyrightText: Copyright (c) 2021, Sam Bacha, <@sambacha> All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+CopyrightNotice
+SPDX-License-Identifier: CC-BY-4.0
+SPDX-FileCopyrightText: © 2020 The Solidity Language Authors
+
+    The Solidity logo is distributed and licensed under a Creative Commons Attribution 4.0 International License.
+    <https://docs.soliditylang.org/en/latest/brand-guide.html#solidity-logo-license>
+    <https://creativecommons.org/licenses/by/4.0/legalcode>
+
+

README.md

@@ -1,61 +1,62 @@
-
 <p align="center">
 <img src='assets/icon.png' width=64>
 	<h1 align="center">solidity-lang</h1>
- <h3 align="center"> visual studio code syntax highlight </h3>
+ <h3 align="center"> VSCode Solidity Semantic Syntax Highlighting</h3>
  <p align="center">
 <align="center">
 
--------------
+---
+
 <br>
 
+<span align="center">
 
-![](https://badgen.net/vs-marketplace/v/contractshark.solidity-lang)
-[![solidity - v0.6.12](https://img.shields.io/badge/solidity-v0.9.0-2ea44f?logo=solidity)](https://github.com/manifoldfinance)
+[![vscode marketplace](https://badgen.net/vs-marketplace/v/contractshark.solidity-lang)](https://marketplace.visualstudio.com/items?itemName=ContractShark.solidity-lang)
+![Open VSX Version](https://img.shields.io/open-vsx/v/contractshark/solidity-lang?logo=eclipse)
+[![solidity - <0.9.0](https://img.shields.io/badge/solidity-v0.9.0-2ea44f?logo=solidity)](https://github.com/manifoldfinance)
+
+</span>
 
 ## Motivation
 
-Every Solidity extenstion on Visual Studio Code's Marketplacce contain multiple plugins. This can lead
-to an inconssistent developer environment, or worse create conflicting configurations that, under the 
-pretense of `helping` you, do things in the background to your files wihtout your explicit knowledge. 
+Every Solidity extension on Visual Studio Code's Marketplace contain multiple plugins. This can lead
+to an inconsistent developer environment, or worse create conflicting configurations that, under the
+pretense of `helping` you, do things in the background to your files without your explicit
+knowledge.
 
-Hence why this extenstion exists: only to provide syntax highlighting so that you can decided what to add without
-having to give up basic functionality.
+Hence why this extension exists: only to provide syntax highlighting so that you can decided what to
+add without having to give up basic functionality.
 
 ## Features
 
-- Solidity Syntax Highlight
-- No other plugins, configurations, etc: just syntax highlighting
+- Solidity Syntax Highlighting
 
-- Support ^0.5.0 to <0.9.0
+- Semantic Syntax Support
 
-- see the additional `.vscode/settings` for better git workspace environment
+- Remote Container / Container support
 
-- [Visual Studio Marketplace](https://marketplace.visualstudio.com/items?itemName=ContractShark.solidity-lang)
+- NatSpec Supported Highlighting
 
-			   
-## Extension Settings
+- Support ^0.5.0 to <0.9.0
 
-This extension contributes the following settings:
+- No other plugins, configurations, etc: just syntax highlighting
 
-* `solidity-lang.enable`: enable/disable this extension
+- see the additional `.vscode/settings` for better git workspace environment
 
+- [Visual Studio Marketplace](https://marketplace.visualstudio.com/items?itemName=ContractShark.solidity-lang)
 
-## Development
+- [Eclipse Open VSX Registry Marketplace](https://open-vsx.org/extension/contractshark/solidity-lang)
 
-## What's in the folder
+## Extension Settings
 
-* This folder contains all of the files necessary for your extension.
-* `package.json` - this is the manifest file in which you declare your language support and define the location of the grammar file that has been copied into your extension.
-* `syntaxes/solidity.tmLanguage.json` - this is the Text mate grammar file that is used for tokenization.
-* `language-configuration.json` - this is the language configuration, defining the tokens that are used for comments and brackets.
+This extension contributes the following settings:
 
+- `solidity-lang.enable`: enable/disable this extension
 
 ## Issues / Support
 
 [github.com/contractshark](https://github.com/contractshark)
 
-
 ## License
 
 SPDX-License-Identifier: MIT

dist/LICENSE.txt

@@ -0,0 +1,38 @@
+SPDX-License-Identifier: BSD 3-Clause License
+SPDX-FileCopyrightText: Copyright (c) 2021, Sam Bacha, <@sambacha> All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+CopyrightNotice
+SPDX-License-Identifier: CC-BY-4.0
+SPDX-FileCopyrightText: © 2020 The Solidity Language Authors
+
+    The Solidity logo is distributed and licensed under a Creative Commons Attribution 4.0 International License.
+    <https://docs.soliditylang.org/en/latest/brand-guide.html#solidity-logo-license>
+    <https://creativecommons.org/licenses/by/4.0/legalcode>
+
+