8
8
* */
9
9
10
10
/** 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" ) ;
19
18
/** global vars */
20
- const VYPER_ID = "vyper" ;
21
- const vyperConfig = vscode . workspace . getConfiguration ( VYPER_ID ) ;
22
19
var activeEditor ;
23
20
24
21
/** classdecs */
@@ -29,23 +26,23 @@ var activeEditor;
29
26
30
27
/** event funcs */
31
28
async function onDidSave ( document ) {
32
- if ( document . languageId != VYPER_ID ) {
29
+ if ( document . languageId != settings . LANGUAGE_ID ) {
33
30
console . log ( "langid mismatch" )
34
31
return ;
35
32
}
36
33
37
34
//always run on save
38
- if ( vyperConfig . compile . onSave ) {
35
+ if ( settings . extensionConfig ( ) . compile . onSave ) {
39
36
mod_compile . compileContractCommand ( document . uri )
40
37
}
41
38
}
42
39
43
40
async function onDidChange ( event ) {
44
- if ( vscode . window . activeTextEditor . document . languageId != VYPER_ID ) {
41
+ if ( vscode . window . activeTextEditor . document . languageId != settings . LANGUAGE_ID ) {
45
42
return ;
46
43
}
47
44
48
- if ( vyperConfig . decoration . enable ) {
45
+ if ( settings . extensionConfig ( ) . decoration . enable ) {
49
46
mod_deco . decorateWords ( activeEditor , [
50
47
{
51
48
regex :"@\\b(public|payable|modifying)\\b" ,
@@ -94,9 +91,8 @@ async function onDidChange(event) {
94
91
}
95
92
}
96
93
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 )
100
96
}
101
97
102
98
function onActivate ( context ) {
@@ -105,7 +101,7 @@ function onActivate(context) {
105
101
if ( ! active || ! active . document ) return ;
106
102
activeEditor = active ;
107
103
108
- registerDocType ( VYPER_ID ) ;
104
+ registerDocType ( settings . LANGUAGE_ID ) ;
109
105
110
106
function registerDocType ( type ) {
111
107
context . subscriptions . push (
@@ -127,7 +123,7 @@ function onActivate(context) {
127
123
vscode . commands . registerCommand ( 'vyper.compileContract' , mod_compile . compileContractCommand )
128
124
)
129
125
130
- if ( ! vyperConfig . mode . active ) {
126
+ if ( ! settings . extensionConfig ( ) . mode . active ) {
131
127
console . log ( "ⓘ activate extension: entering passive mode. not registering any active code augmentation support." )
132
128
return ;
133
129
}
0 commit comments