diff --git a/src/configuration.ts b/src/configuration.ts index a66eb68..2987e74 100644 --- a/src/configuration.ts +++ b/src/configuration.ts @@ -1,20 +1,16 @@ 'use strict'; -import { Disposable, ExtensionContext, IndentAction, LanguageConfiguration, OnEnterRule, TextEditor, TextEditorEdit, commands, languages, workspace, } from 'vscode'; +import { Disposable, ExtensionContext, LanguageConfiguration, TextEditor, TextEditorEdit, commands, languages, workspace } from 'vscode'; import { Rules } from './rules'; - -let fs = require('fs'); +import { config as singleLineConfig } from './single-line-configuration'; +import { config as multiLineConfig } from './multi-line-configuration'; export class Configuration { private readonly extensionName: string = "auto-comment-blocks"; private readonly singleLineBlockCommand: string = "auto-comment-blocks.singleLineBlock"; - private readonly singleLineConfigFile: string = __dirname + - "/../../language-configuration/single-line-configuration.json"; - private readonly multiLineConfigFile: string = __dirname + - "/../../language-configuration/multi-line-configuration.json"; private readonly singleLineBlockOnEnter: string = "singleLineBlockOnEnter"; private readonly slashStyleBlocks: string = "slashStyleBlocks"; @@ -37,9 +33,6 @@ export class Configuration { } private getMultiLineLanguages(): Array { - - let multiLineConfig = JSON.parse(fs.readFileSync( - this.multiLineConfigFile, 'utf-8')); return multiLineConfig["languages"]; } @@ -75,9 +68,6 @@ export class Configuration { } private getSingleLineLanguages() { - - let singleLineConfig: Object = JSON.parse(fs.readFileSync( - this.singleLineConfigFile, 'utf-8')); let commentStyles = Object.keys(singleLineConfig); for (let key of commentStyles) { for (let langId of singleLineConfig[key]) { diff --git a/src/extension.ts b/src/extension.ts index 3b4bca8..c0a82db 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -1,9 +1,8 @@ 'use strict'; -import { languages, commands, workspace, ExtensionContext, IndentAction, LanguageConfiguration, OnEnterRule, Disposable } from 'vscode'; +import { ExtensionContext } from 'vscode'; import { Configuration } from './configuration'; -let fs = require('fs'); let configuration = new Configuration(); export function activate(context: ExtensionContext) { diff --git a/language-configuration/multi-line-configuration.json b/src/multi-line-configuration.ts similarity index 89% rename from language-configuration/multi-line-configuration.json rename to src/multi-line-configuration.ts index f41886b..c5dae59 100644 --- a/language-configuration/multi-line-configuration.json +++ b/src/multi-line-configuration.ts @@ -1,4 +1,4 @@ -{ +export const config = { "languages": [ "c", "cpp", diff --git a/language-configuration/single-line-configuration.json b/src/single-line-configuration.ts similarity index 94% rename from language-configuration/single-line-configuration.json rename to src/single-line-configuration.ts index fce0efd..523bdcc 100644 --- a/language-configuration/single-line-configuration.json +++ b/src/single-line-configuration.ts @@ -1,4 +1,4 @@ -{ +export const config = { "//": [ "c", "cpp",