Skip to content

Commit 4045a2d

Browse files
committed
fix settings should take effect immediately
updated to mythxjs from armlet prepare 0.0.9
1 parent b208b27 commit 4045a2d

File tree

10 files changed

+319
-76
lines changed

10 files changed

+319
-76
lines changed

Diff for: CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Change Log
22

3+
## 0.0.9
4+
- updated mythx library: switched from `armlet` to `mythxjs`.
5+
- fix: make settings take effect immediately.
6+
37
## 0.0.8
48
- fix misused promises
59

Diff for: README.md

+3-8
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,8 @@ Note: Active features can be disabled by setting `Settings` → `Vyper` → `Mod
9090

9191
see [CHANGELOG](./CHANGELOG.md)
9292

93-
## 0.0.8
94-
- fix misused promises
95-
96-
## 0.0.7
97-
- updated grammar
98-
- fixed mythX issue due to API change
99-
- fixed diagnostics handling: compiler warnings and mythx are now updated on a per file basis.
100-
- fixed run compile / when file is opened the first time, not only on change.
93+
## 0.0.9
94+
- updated mythx library: switched from `armlet` to `mythxjs`.
95+
- fix: make settings take effect immediately.
10196

10297
-----------------------------------------------------------------------------------------------------------

Diff for: package-lock.json

+226
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: package.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
"name": "vscode-vyper",
33
"displayName": "Vyper",
44
"description": "Ethereum Vyper language support for Visual Studio Code",
5-
"version": "0.0.8",
5+
"license": "MIT",
6+
"version": "0.0.9",
67
"keywords": [
78
"vyper",
89
"ethereum",
@@ -125,8 +126,9 @@
125126
"fetchGrammar": "rm -f syntaxes/vyper.tmLanguage.json && python3 ./scripts/fetch_vyper_language_spec.py > syntaxes/vyper.tmLanguage.json"
126127
},
127128
"dependencies": {
128-
"armlet": "^2.3.0",
129129
"async": "^2.6.2",
130+
"chai": "^4.2.0",
131+
"mythxjs": "^1.3.1",
130132
"shell-escape": "^0.2.0"
131133
}
132134
}

Diff for: src/extension.js

+15-19
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,14 @@
88
* */
99

1010
/** imports */
11-
const vscode = require("vscode")
12-
const crypto = require("crypto")
13-
14-
const mod_deco = require("./features/deco.js")
15-
const mod_signatures = require("./features/signatures.js")
16-
const mod_hover = require("./features/hover/hover.js")
17-
const mod_compile = require("./features/compile.js")
18-
const mod_analyze = require("./features/analyze.js")
11+
const vscode = require("vscode");
12+
13+
const mod_deco = require("./features/deco.js");
14+
const mod_signatures = require("./features/signatures.js");
15+
const mod_hover = require("./features/hover/hover.js");
16+
const mod_compile = require("./features/compile.js");
17+
const settings = require("./settings");
1918
/** global vars */
20-
const VYPER_ID = "vyper";
21-
const vyperConfig = vscode.workspace.getConfiguration(VYPER_ID);
2219
var activeEditor;
2320

2421
/** classdecs */
@@ -29,23 +26,23 @@ var activeEditor;
2926

3027
/** event funcs */
3128
async function onDidSave(document){
32-
if(document.languageId!=VYPER_ID){
29+
if(document.languageId != settings.LANGUAGE_ID){
3330
console.log("langid mismatch")
3431
return;
3532
}
3633

3734
//always run on save
38-
if(vyperConfig.compile.onSave){
35+
if(settings.extensionConfig().compile.onSave){
3936
mod_compile.compileContractCommand(document.uri)
4037
}
4138
}
4239

4340
async function onDidChange(event) {
44-
if(vscode.window.activeTextEditor.document.languageId!=VYPER_ID){
41+
if(vscode.window.activeTextEditor.document.languageId != settings.LANGUAGE_ID){
4542
return;
4643
}
4744

48-
if(vyperConfig.decoration.enable){
45+
if(settings.extensionConfig().decoration.enable){
4946
mod_deco.decorateWords(activeEditor, [
5047
{
5148
regex:"@\\b(public|payable|modifying)\\b",
@@ -94,9 +91,8 @@ async function onDidChange(event) {
9491
}
9592
}
9693
function onInitModules(context, type) {
97-
mod_hover.init(context, type, vyperConfig)
98-
mod_compile.init(context, type, vyperConfig)
99-
//mod_analyze.init(context, type, vyperConfig)
94+
mod_hover.init(context, type)
95+
mod_compile.init(context, type)
10096
}
10197

10298
function onActivate(context) {
@@ -105,7 +101,7 @@ function onActivate(context) {
105101
if (!active || !active.document) return;
106102
activeEditor = active;
107103

108-
registerDocType(VYPER_ID);
104+
registerDocType(settings.LANGUAGE_ID);
109105

110106
function registerDocType(type) {
111107
context.subscriptions.push(
@@ -127,7 +123,7 @@ function onActivate(context) {
127123
vscode.commands.registerCommand('vyper.compileContract', mod_compile.compileContractCommand)
128124
)
129125

130-
if(!vyperConfig.mode.active){
126+
if(!settings.extensionConfig().mode.active){
131127
console.log("ⓘ activate extension: entering passive mode. not registering any active code augmentation support.")
132128
return;
133129
}

0 commit comments

Comments
 (0)