Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 3 additions & 13 deletions src/configuration.ts
Original file line number Diff line number Diff line change
@@ -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";
Expand All @@ -37,9 +33,6 @@ export class Configuration {
}

private getMultiLineLanguages(): Array<string> {

let multiLineConfig = JSON.parse(fs.readFileSync(
this.multiLineConfigFile, 'utf-8'));
return multiLineConfig["languages"];
}

Expand Down Expand Up @@ -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]) {
Expand Down
3 changes: 1 addition & 2 deletions src/extension.ts
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
export const config = {
"languages": [
"c",
"cpp",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
export const config = {
"//": [
"c",
"cpp",
Expand Down