Always use the embedded Debug Adapter (#218)

fix: always use the embedded debug adapter

.vscodeignore

@@ -9,7 +9,6 @@ out/**
 !out/src/Nethereum.Generators.DuoCode.js
 !out/src/extension.js
 !out/src/debugger.js
-!out/src/web3ProviderResolver.js
 !out/src/checkTruffleConfigTemplate.js
 src/**
 test/**

package.json

@@ -535,7 +535,6 @@
       {
         "type": "truffle",
         "label": "Truffle - Debugger",
-        "program": "./out/src/debugger.js",
         "runtime": "node",
         "configurationAttributes": {
           "launch": {
@@ -700,7 +699,7 @@
     "webpack:dev": "webpack --config webpack.dev.js",
     "webpack:prod": "webpack --config webpack.prod.js",
     "watch:webpack": "webpack --watch --config webpack.dev.js",
-    "copyFiles": "copyfiles -V -f ./src/debugAdapter/web3ProviderResolver.js ./src/helpers/checkTruffleConfigTemplate.js ./out/src/ ",
+    "copyFiles": "copyfiles -V -f ./src/helpers/checkTruffleConfigTemplate.js ./out/src/",
     "watch:tsc": "tsc-watch --onCompilationComplete \"yarn copyFiles\" ",
     "watch": "yarn watch:tsc",
     "prettier": "prettier --check .",

src/debugAdapter/configuration/debuggerConfiguration.ts

@@ -2,7 +2,7 @@
 // Licensed under the MIT license.
 
 import {debug, ExtensionContext} from 'vscode';
-import {DEBUG_TYPE, EMBED_DEBUG_ADAPTER} from '../constants/debugAdapter';
+import {DEBUG_TYPE} from '../constants/debugAdapter';
 import DebugAdapterTrackerFactory from '../debugAdapterTracker/debugAdapterTrackerFactory';
 import DebugAdapterDescriptorFactory from './debugAdapterDescriptorFactory';
 import DebuggerConfigurationProvider from './debugConfigurationProvider';
@@ -12,11 +12,9 @@ export class DebuggerConfiguration {
     const debugConfigProvider = new DebuggerConfigurationProvider();
     context.subscriptions.push(debug.registerDebugConfigurationProvider(DEBUG_TYPE, debugConfigProvider));
 
-    if (EMBED_DEBUG_ADAPTER) {
-      const factory = new DebugAdapterDescriptorFactory();
-      context.subscriptions.push(debug.registerDebugAdapterDescriptorFactory(DEBUG_TYPE, factory));
-      context.subscriptions.push(factory);
-    }
+    const factory = new DebugAdapterDescriptorFactory();
+    context.subscriptions.push(debug.registerDebugAdapterDescriptorFactory(DEBUG_TYPE, factory));
+    context.subscriptions.push(factory);
 
     const debugAdapterTrackerFactory = new DebugAdapterTrackerFactory();
     const trackerFactory = debug.registerDebugAdapterTrackerFactory(DEBUG_TYPE, debugAdapterTrackerFactory);

src/debugAdapter/constants/debugAdapter.ts

@@ -37,6 +37,4 @@ export const EVALUATE_REQUEST_TYPES = {
 
 export const DEBUG_TYPE = 'truffle';
 
-export const EMBED_DEBUG_ADAPTER = typeof IS_BUNDLE_TIME === 'undefined' || IS_BUNDLE_TIME === false;
-
 export const ERROR_MESSAGE_ID = 1;

src/debugAdapter/debugNetwork.ts

@@ -12,7 +12,7 @@ import {showQuickPick} from '@/helpers/userInteraction';
 import {QuickPickItem} from 'vscode';
 import {LocalProject} from '@/Models/TreeItems/LocalProject';
 import {LocalNetworkNode} from '@/Models/TreeItems';
-import {ConfigurationReader} from './configurationReader';
+import {ConfigurationReader} from '../helpers/debugConfigurationReader';
 
 export class DebugNetwork {
   public workingDirectory: string;

src/debugAdapter/configurationReader.ts → src/helpers/debugConfigurationReader.ts

@@ -12,7 +12,7 @@ import {generate} from 'astring';
 import ESTree from 'estree';
 import fs from 'fs-extra';
 import path from 'path';
-import {tryExecuteCommandInFork} from './cmdCommandExecutor';
+import {tryExecuteCommandInFork} from '../debugAdapter/cmdCommandExecutor';
 import {IConfiguration, INetwork, INetworkOption, IProvider} from '@/helpers/ConfigurationReader';
 
 const truffleConfigRequireNames = {
@@ -134,10 +134,7 @@ export namespace ConfigurationReader {
   }
 
   async function getTruffleMetadata(workingDirectory: string): Promise<IConfiguration> {
-    const truffleConfigTemplatePath =
-      typeof IS_BUNDLE_TIME === 'undefined' || IS_BUNDLE_TIME === false
-        ? path.join(__dirname, '..', 'helpers', 'checkTruffleConfigTemplate.js')
-        : path.join(__dirname, 'checkTruffleConfigTemplate.js');
+    const truffleConfigTemplatePath = path.join(__dirname, 'checkTruffleConfigTemplate.js');
     const truffleConfigPath = 'truffle-config.js';
 
     const result = await tryExecuteCommandInFork(workingDirectory, truffleConfigTemplatePath, truffleConfigPath);

webpack.common.js

@@ -11,16 +11,12 @@ module.exports = {
   target: 'node',
   entry: {
     extension: './src/extension.ts',
-    debugger: './src/debugger.ts',
   },
   output: {
     path: path.join(__dirname, 'out', 'src'),
     filename: '[name].js',
     libraryTarget: 'commonjs2',
   },
-  optimization: {
-    minimize: true,
-  },
   externals: function ({context, request}, callback) {
     if (/^vscode$/.test(request)) {
       return callback(null, 'commonjs ' + request);
@@ -52,13 +48,7 @@ module.exports = {
   },
   plugins: [
     new CopyPlugin({
-      patterns: [
-        {from: './src/debugAdapter/web3ProviderResolver.js', to: './'},
-        {from: './src/helpers/checkTruffleConfigTemplate.js', to: './'},
-      ],
-    }),
-    new webpack.DefinePlugin({
-      IS_BUNDLE_TIME: true,
+      patterns: [{from: './src/helpers/checkTruffleConfigTemplate.js', to: './'}],
     }),
   ],
   node: {

webpack.prod.js

@@ -4,4 +4,7 @@ const common = require('./webpack.common.js');
 module.exports = merge(common, {
   mode: 'production',
   devtool: 'source-map',
+  optimization: {
+    minimize: true,
+  },
 });