Skip to content

Commit 362be74

Browse files
sambachasambacha
committed
2 parents 86a55c8 + 142ca02 commit 362be74

33 files changed

+2678
-3306
lines changed

‎.github/workflows/nodejs-ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name: nodejs
33
on:
44
push:
5-
paths:
5+
paths:
66
- "**/**"
77
- "!**/*.md/**"
88

@@ -18,8 +18,8 @@ jobs:
1818
strategy:
1919
fail-fast: false
2020
matrix:
21-
node: ['14']
22-
os: ['ubuntu-latest']
21+
node: ["14"]
22+
os: ["ubuntu-latest"]
2323

2424
steps:
2525
- name: Clone repository

‎.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,11 @@ node_modules
77
*.tgz
88
*.zip
99
*.tar
10-
dist/
1110
build/
1211
cache
1312
.cache/
1413
*.log
1514
*-error.
15+
solidity-lang-*.zip
16+
*.vsix
17+
!dist/*.vsix

‎.prettierrc.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
"bracketSpacing": true,
55
"jsxBracketSameLine": false,
66
"jsxSingleQuote": false,
7-
"printWidth": 80,
7+
"printWidth": 100,
88
"proseWrap": "always",
99
"quoteProps": "as-needed",
1010
"semi": true,
11-
"singleQuote": true,
11+
"singleQuote": false,
1212
"tabWidth": 2,
13-
"trailingComma": "all",
13+
"trailingComma": "es5",
1414
"useTabs": false
1515
}

‎.vscode/extensions.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"recommendations": ["leodevbro.blockman"]
3+
}

‎.vscode/launch.json

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,13 @@
33
// Hover to view descriptions of existing attributes.
44
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
55
{
6-
"version": "0.2.0",
7-
"configurations": [
8-
{
9-
"name": "Extension",
10-
"type": "extensionHost",
11-
"request": "launch",
12-
"args": [
13-
"--extensionDevelopmentPath=${workspaceFolder}"
14-
]
15-
}
16-
]
17-
}
6+
"version": "0.2.0",
7+
"configurations": [
8+
{
9+
"name": "Extension",
10+
"type": "extensionHost",
11+
"request": "launch",
12+
"args": ["--extensionDevelopmentPath=${workspaceFolder}"]
13+
}
14+
]
15+
}

‎.vscode/settings.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"files.trimTrailingWhitespace": true,
3-
"gitlens.advanced.blame.customArguments": ["--ignore-revs-file", ".gitignore-revs"],
2+
"files.trimTrailingWhitespace": true,
3+
"gitlens.advanced.blame.customArguments": ["--ignore-revs-file", ".gitignore-revs"]
44
}

‎.vscodeignore

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
1-
.vscode/**
2-
.vscode-test/**
1+
.github/**
32
.gitignore
4-
vsc-extension-quickstart.md
3+
.prettierignore
4+
.vscode-test/**
5+
.vscode/**
6+
.yarnrc
7+
**/.eslintrc.json
8+
**/*.map
9+
**/*.ts
10+
**/test/*
11+
**/tsconfig.json
12+
node_modules
13+

‎CHANGELOG.md

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎DEVELOPMENT.md

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎LICENSE.txt

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

‎README.md

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,62 @@
1-
21
<p align="center">
32
<img src='assets/icon.png' width=64>
43
<h1 align="center">solidity-lang</h1>
5-
<h3 align="center"> visual studio code syntax highlight </h3>
4+
<h3 align="center"> VSCode Solidity Semantic Syntax Highlighting</h3>
65
<p align="center">
76
<align="center">
87

9-
-------------
8+
---
9+
1010
<br>
1111

12+
<span align="center">
1213

13-
![](https://badgen.net/vs-marketplace/v/contractshark.solidity-lang)
14-
[![solidity - v0.6.12](https://img.shields.io/badge/solidity-v0.9.0-2ea44f?logo=solidity)](https://github.com/manifoldfinance)
14+
[![vscode marketplace](https://badgen.net/vs-marketplace/v/contractshark.solidity-lang)](https://marketplace.visualstudio.com/items?itemName=ContractShark.solidity-lang)
15+
![Open VSX Version](https://img.shields.io/open-vsx/v/contractshark/solidity-lang?logo=eclipse)
16+
[![solidity - <0.9.0](https://img.shields.io/badge/solidity-v0.9.0-2ea44f?logo=solidity)](https://github.com/manifoldfinance)
17+
18+
</span>
1519

1620
## Motivation
1721

18-
Every Solidity extenstion on Visual Studio Code's Marketplacce contain multiple plugins. This can lead
19-
to an inconssistent developer environment, or worse create conflicting configurations that, under the
20-
pretense of `helping` you, do things in the background to your files wihtout your explicit knowledge.
22+
Every Solidity extension on Visual Studio Code's Marketplace contain multiple plugins. This can lead
23+
to an inconsistent developer environment, or worse create conflicting configurations that, under the
24+
pretense of `helping` you, do things in the background to your files without your explicit
25+
knowledge.
2126

22-
Hence why this extenstion exists: only to provide syntax highlighting so that you can decided what to add without
23-
having to give up basic functionality.
27+
Hence why this extension exists: only to provide syntax highlighting so that you can decided what to
28+
add without having to give up basic functionality.
2429

2530
## Features
2631

27-
- Solidity Syntax Highlight
28-
- No other plugins, configurations, etc: just syntax highlighting
32+
- Solidity Syntax Highlighting
2933

30-
- Support ^0.5.0 to <0.9.0
34+
- Semantic Syntax Support
3135

32-
- see the additional `.vscode/settings` for better git workspace environment
36+
- Remote Container / Container support
3337

34-
- [Visual Studio Marketplace](https://marketplace.visualstudio.com/items?itemName=ContractShark.solidity-lang)
38+
- NatSpec Supported Highlighting
3539

36-
37-
## Extension Settings
40+
- Support ^0.5.0 to <0.9.0
3841

39-
This extension contributes the following settings:
42+
- No other plugins, configurations, etc: just syntax highlighting
4043

41-
* `solidity-lang.enable`: enable/disable this extension
44+
- see the additional `.vscode/settings` for better git workspace environment
4245

46+
- [Visual Studio Marketplace](https://marketplace.visualstudio.com/items?itemName=ContractShark.solidity-lang)
4347

44-
## Development
48+
- [Eclipse Open VSX Registry Marketplace](https://open-vsx.org/extension/contractshark/solidity-lang)
4549

46-
## What's in the folder
50+
## Extension Settings
4751

48-
* This folder contains all of the files necessary for your extension.
49-
* `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.
50-
* `syntaxes/solidity.tmLanguage.json` - this is the Text mate grammar file that is used for tokenization.
51-
* `language-configuration.json` - this is the language configuration, defining the tokens that are used for comments and brackets.
52+
This extension contributes the following settings:
5253

54+
- `solidity-lang.enable`: enable/disable this extension
5355

5456
## Issues / Support
5557

5658
[github.com/contractshark](https://github.com/contractshark)
5759

58-
5960
## License
6061

6162
SPDX-License-Identifier: MIT

‎dist/LICENSE.txt

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

0 commit comments

Comments
 (0)