Merge pull request #307 from BalticAmadeus/190-move-code-files-out-of…

…-v2-directory

formatters moved from v2

src/extension.ts

@@ -4,16 +4,16 @@ import { AblFormatterProvider } from "./providers/AblFormatterProvider";
 import { Constants } from "./model/Constants";
 import { AblParserHelper } from "./parser/AblParserHelper";
 import { AblDebugHoverProvider } from "./providers/AblDebugHoverProvider";
-import { ConfigurationManager2 } from "./utils/ConfigurationManager";
-import { enableFormatterDecorators } from "./v2/formatterFramework/enableFormatterDecorators";
+import { ConfigurationManager } from "./utils/ConfigurationManager";
+import { enableFormatterDecorators } from "./formatterFramework/enableFormatterDecorators";
 import { DebugManager } from "./providers/DebugManager";
 
 export async function activate(context: vscode.ExtensionContext) {
     const debugManager = DebugManager.getInstance(context);
 
     await Parser.init().then(() => {});
 
-    ConfigurationManager2.getInstance();
+    ConfigurationManager.getInstance();
     enableFormatterDecorators();
 
     const parserHelper = new AblParserHelper(

src/v2/formatterFramework/FormatterFactory.ts → src/formatterFramework/FormatterFactory.ts

@@ -1,4 +1,4 @@
-import { IConfigurationManager } from "../../utils/IConfigurationManager";
+import { IConfigurationManager } from "../utils/IConfigurationManager";
 import { IFormatter } from "./IFormatter";
 import { formatterRegistry } from "./formatterDecorator";
 

src/v2/formatterFramework/FormatterHelper.ts → src/formatterFramework/FormatterHelper.ts

@@ -1,6 +1,6 @@
 import { SyntaxNode } from "web-tree-sitter";
 import { FullText } from "../model/FullText";
-import { SyntaxNodeType } from "../../model/SyntaxNodeType";
+import { SyntaxNodeType } from "../model/SyntaxNodeType";
 import { log } from "console";
 
 export class FormatterHelper {
@@ -116,7 +116,10 @@ export class FormatterHelper {
             return index === 0
                 ? line
                 : " ".repeat(
-                      Math.max(0, FormatterHelper.countLeadingSpaces(line) + moveDelta)
+                      Math.max(
+                          0,
+                          FormatterHelper.countLeadingSpaces(line) + moveDelta
+                      )
                   ) + line.trim();
         });
 

src/v2/formatterFramework/FormattingEngine.ts → src/formatterFramework/FormattingEngine.ts

@@ -1,15 +1,15 @@
 import { SyntaxNode, Tree } from "web-tree-sitter";
-import { IParserHelper } from "../../parser/IParserHelper";
-import { FileIdentifier } from "../../model/FileIdentifier";
+import { IParserHelper } from "../parser/IParserHelper";
+import { FileIdentifier } from "../model/FileIdentifier";
 import { IFormatter } from "./IFormatter";
 import { BlockFormater } from "../formatters/block/BlockFormatter";
 import { CodeEdit } from "../model/CodeEdit";
 import { FullText } from "../model/FullText";
-import { IConfigurationManager } from "../../utils/IConfigurationManager";
-import { ParseResult } from "../../model/ParseResult";
+import { IConfigurationManager } from "../utils/IConfigurationManager";
+import { ParseResult } from "../model/ParseResult";
 import { FormatterFactory } from "./FormatterFactory";
 import { EOL } from "../model/EOL";
-import { IDebugManager } from "../../providers/IDebugManager";
+import { IDebugManager } from "../providers/IDebugManager";
 
 export class FormattingEngine {
     private numOfCodeEdits: number = 0;

src/v2/formatters/AFormatter.ts → src/formatters/AFormatter.ts

@@ -1,5 +1,5 @@
 import { SyntaxNode } from "web-tree-sitter";
-import { IConfigurationManager } from "../../utils/IConfigurationManager";
+import { IConfigurationManager } from "../utils/IConfigurationManager";
 import { CodeEdit } from "../model/CodeEdit";
 import { FullText } from "../model/FullText";
 
@@ -17,9 +17,12 @@ export abstract class AFormatter {
         fullText: FullText
     ): CodeEdit {
         const diff = newText.length - oldText.length;
-        const rowDiff = newText.split(fullText.eolDelimiter).length - oldText.split(fullText.eolDelimiter).length;
-        const lastRowColumn =
-            newText.split(fullText.eolDelimiter)[newText.split(fullText.eolDelimiter).length - 1].length;
+        const rowDiff =
+            newText.split(fullText.eolDelimiter).length -
+            oldText.split(fullText.eolDelimiter).length;
+        const lastRowColumn = newText.split(fullText.eolDelimiter)[
+            newText.split(fullText.eolDelimiter).length - 1
+        ].length;
 
         return {
             text: newText,
@@ -36,4 +39,4 @@ export abstract class AFormatter {
             },
         };
     }
-}
+}

src/v2/formatters/ASettings.ts → src/formatters/ASettings.ts

@@ -1,4 +1,4 @@
-import { IConfigurationManager } from "../../utils/IConfigurationManager";
+import { IConfigurationManager } from "../utils/IConfigurationManager";
 
 export abstract class ASettings {
     public constructor(

src/v2/formatters/arrayAccess/ArrayAccessFormatter.ts → src/formatters/arrayAccess/ArrayAccessFormatter.ts

@@ -1,12 +1,12 @@
 import { SyntaxNode } from "web-tree-sitter";
 import { IFormatter } from "../../formatterFramework/IFormatter";
-import { SyntaxNodeType } from "../../../model/SyntaxNodeType";
+import { SyntaxNodeType } from "../../model/SyntaxNodeType";
 import { CodeEdit } from "../../model/CodeEdit";
 import { FullText } from "../../model/FullText";
 import { FormatterHelper } from "../../formatterFramework/FormatterHelper";
 import { AFormatter } from "../AFormatter";
 import { RegisterFormatter } from "../../formatterFramework/formatterDecorator";
-import { IConfigurationManager } from "../../../utils/IConfigurationManager";
+import { IConfigurationManager } from "../../utils/IConfigurationManager";
 import { ArrayAccessSettings } from "./ArrayAccessSettings";
 
 @RegisterFormatter

src/v2/formatters/assign/AssignFormatter.ts → src/formatters/assign/AssignFormatter.ts

@@ -4,10 +4,10 @@ import { CodeEdit } from "../../model/CodeEdit";
 import { FullText } from "../../model/FullText";
 import { AFormatter } from "../AFormatter";
 import { RegisterFormatter } from "../../formatterFramework/formatterDecorator";
-import { SyntaxNodeType } from "../../../model/SyntaxNodeType";
+import { SyntaxNodeType } from "../../model/SyntaxNodeType";
 import { FormatterHelper } from "../../formatterFramework/FormatterHelper";
 import { AssignSettings } from "./AssignSettings";
-import { IConfigurationManager } from "../../../utils/IConfigurationManager";
+import { IConfigurationManager } from "../../utils/IConfigurationManager";
 
 @RegisterFormatter
 export class AssignFormatter extends AFormatter implements IFormatter {

src/v2/formatters/block/BlockFormatter.ts → src/formatters/block/BlockFormatter.ts

@@ -1,15 +1,12 @@
 import { SyntaxNode } from "web-tree-sitter";
 import { IFormatter } from "../../formatterFramework/IFormatter";
-import {
-    bodyBlockKeywords,
-    SyntaxNodeType,
-} from "../../../model/SyntaxNodeType";
+import { bodyBlockKeywords, SyntaxNodeType } from "../../model/SyntaxNodeType";
 import { CodeEdit } from "../../model/CodeEdit";
 import { FullText } from "../../model/FullText";
 import { FormatterHelper } from "../../formatterFramework/FormatterHelper";
 import { AFormatter } from "../AFormatter";
 import { RegisterFormatter } from "../../formatterFramework/formatterDecorator";
-import { IConfigurationManager } from "../../../utils/IConfigurationManager";
+import { IConfigurationManager } from "../../utils/IConfigurationManager";
 import { BlockSettings } from "./BlockSettings";
 
 @RegisterFormatter

src/v2/formatters/body/BodyFormatter.ts → src/formatters/body/BodyFormatter.ts

@@ -5,11 +5,8 @@ import { CodeEdit } from "../../model/CodeEdit";
 import { FullText } from "../../model/FullText";
 import { AFormatter } from "../AFormatter";
 import { BodySettings } from "./BodySettings";
-import { IConfigurationManager } from "../../../utils/IConfigurationManager";
-import {
-    bodyBlockKeywords,
-    SyntaxNodeType,
-} from "../../../model/SyntaxNodeType";
+import { IConfigurationManager } from "../../utils/IConfigurationManager";
+import { bodyBlockKeywords, SyntaxNodeType } from "../../model/SyntaxNodeType";
 import { FormatterHelper } from "../../formatterFramework/FormatterHelper";
 
 @RegisterFormatter

src/v2/formatters/case/CaseFormatter.ts → src/formatters/case/CaseFormatter.ts

@@ -4,12 +4,12 @@ import { CodeEdit } from "../../model/CodeEdit";
 import { FullText } from "../../model/FullText";
 import { AFormatter } from "../AFormatter";
 import { CaseSettings } from "./CaseSettings";
-import { IConfigurationManager } from "../../../utils/IConfigurationManager";
+import { IConfigurationManager } from "../../utils/IConfigurationManager";
 import { RegisterFormatter } from "../../formatterFramework/formatterDecorator";
 import {
     afterThenStatements,
     SyntaxNodeType,
-} from "../../../model/SyntaxNodeType";
+} from "../../model/SyntaxNodeType";
 import { FormatterHelper } from "../../formatterFramework/FormatterHelper";
 
 @RegisterFormatter

src/v2/formatters/enum/EnumFormatter.ts → src/formatters/enum/EnumFormatter.ts

@@ -5,8 +5,8 @@ import { CodeEdit } from "../../model/CodeEdit";
 import { FullText } from "../../model/FullText";
 import { AFormatter } from "../AFormatter";
 import { EnumSettings } from "./EnumSettings";
-import { IConfigurationManager } from "../../../utils/IConfigurationManager";
-import { SyntaxNodeType } from "../../../model/SyntaxNodeType";
+import { IConfigurationManager } from "../../utils/IConfigurationManager";
+import { SyntaxNodeType } from "../../model/SyntaxNodeType";
 import { FormatterHelper } from "../../formatterFramework/FormatterHelper";
 
 @RegisterFormatter

src/v2/formatters/expression/ExpressionFormatter.ts → src/formatters/expression/ExpressionFormatter.ts

@@ -4,9 +4,9 @@ import { IFormatter } from "../../formatterFramework/IFormatter";
 import { CodeEdit } from "../../model/CodeEdit";
 import { FullText } from "../../model/FullText";
 import { AFormatter } from "../AFormatter";
-import { IConfigurationManager } from "../../../utils/IConfigurationManager";
+import { IConfigurationManager } from "../../utils/IConfigurationManager";
 import { ExpressionSettings } from "./ExpressionSettings";
-import { logicalKeywords, SyntaxNodeType } from "../../../model/SyntaxNodeType";
+import { logicalKeywords, SyntaxNodeType } from "../../model/SyntaxNodeType";
 import { FormatterHelper } from "../../formatterFramework/FormatterHelper";
 
 @RegisterFormatter

src/v2/formatters/find/FindFormatter.ts → src/formatters/find/FindFormatter.ts

@@ -1,13 +1,13 @@
 import { SyntaxNode } from "web-tree-sitter";
 import { IFormatter } from "../../formatterFramework/IFormatter";
-import { SyntaxNodeType } from "../../../model/SyntaxNodeType";
+import { SyntaxNodeType } from "../../model/SyntaxNodeType";
 import { CodeEdit } from "../../model/CodeEdit";
 import { FullText } from "../../model/FullText";
 import { FormatterHelper } from "../../formatterFramework/FormatterHelper";
 import { AFormatter } from "../AFormatter";
 import { RegisterFormatter } from "../../formatterFramework/formatterDecorator";
 import { FindSettings } from "./FindSettings";
-import { IConfigurationManager } from "../../../utils/IConfigurationManager";
+import { IConfigurationManager } from "../../utils/IConfigurationManager";
 
 @RegisterFormatter
 export class FindFormatter extends AFormatter implements IFormatter {

src/v2/formatters/for/ForFormatter.ts → src/formatters/for/ForFormatter.ts

@@ -1,13 +1,13 @@
 import { SyntaxNode } from "web-tree-sitter";
 import { IFormatter } from "../../formatterFramework/IFormatter";
-import { SyntaxNodeType } from "../../../model/SyntaxNodeType";
+import { SyntaxNodeType } from "../../model/SyntaxNodeType";
 import { CodeEdit } from "../../model/CodeEdit";
 import { FullText } from "../../model/FullText";
 import { FormatterHelper } from "../../formatterFramework/FormatterHelper";
 import { AFormatter } from "../AFormatter";
 import { RegisterFormatter } from "../../formatterFramework/formatterDecorator";
 import { ForSettings } from "./ForSettings";
-import { IConfigurationManager } from "../../../utils/IConfigurationManager";
+import { IConfigurationManager } from "../../utils/IConfigurationManager";
 
 @RegisterFormatter
 export class ForFormatter extends AFormatter implements IFormatter {

src/v2/formatters/functionParameter/FunctionParameterFormatter.ts → src/formatters/functionParameter/FunctionParameterFormatter.ts

@@ -10,9 +10,9 @@ import {
     parameterTypes,
     parentheses,
     SyntaxNodeType,
-} from "../../../model/SyntaxNodeType";
+} from "../../model/SyntaxNodeType";
 import { FunctionParameterSettings } from "./FunctionParameterSettings";
-import { IConfigurationManager } from "../../../utils/IConfigurationManager";
+import { IConfigurationManager } from "../../utils/IConfigurationManager";
 import { FormatterHelper } from "../../formatterFramework/FormatterHelper";
 
 @RegisterFormatter

src/v2/formatters/if/IfFormatter.ts → src/formatters/if/IfFormatter.ts

@@ -4,12 +4,12 @@ import { CodeEdit } from "../../model/CodeEdit";
 import { FullText } from "../../model/FullText";
 import { AFormatter } from "../AFormatter";
 import { IfSettings } from "./IfSettings";
-import { IConfigurationManager } from "../../../utils/IConfigurationManager";
+import { IConfigurationManager } from "../../utils/IConfigurationManager";
 import { RegisterFormatter } from "../../formatterFramework/formatterDecorator";
 import {
     afterThenStatements,
     SyntaxNodeType,
-} from "../../../model/SyntaxNodeType";
+} from "../../model/SyntaxNodeType";
 import { FormatterHelper } from "../../formatterFramework/FormatterHelper";
 
 @RegisterFormatter

src/v2/formatters/ifFunction/IfFunctionFormatter.ts → src/formatters/ifFunction/IfFunctionFormatter.ts

@@ -5,8 +5,8 @@ import { CodeEdit } from "../../model/CodeEdit";
 import { FullText } from "../../model/FullText";
 import { AFormatter } from "../AFormatter";
 import { IfFunctionSettings } from "./IfFunctionSettings";
-import { IConfigurationManager } from "../../../utils/IConfigurationManager";
-import { SyntaxNodeType } from "../../../model/SyntaxNodeType";
+import { IConfigurationManager } from "../../utils/IConfigurationManager";
+import { SyntaxNodeType } from "../../model/SyntaxNodeType";
 import { FormatterHelper } from "../../formatterFramework/FormatterHelper";
 
 @RegisterFormatter

src/v2/formatters/procedureParameter/ProcedureParameterFormatter.ts → src/formatters/procedureParameter/ProcedureParameterFormatter.ts

@@ -8,9 +8,9 @@ import {
     definitionKeywords,
     parameterTypes,
     SyntaxNodeType,
-} from "../../../model/SyntaxNodeType";
+} from "../../model/SyntaxNodeType";
 import { ProcedureParameterSettings } from "./ProcedureParameterSettings";
-import { IConfigurationManager } from "../../../utils/IConfigurationManager";
+import { IConfigurationManager } from "../../utils/IConfigurationManager";
 import { FormatterHelper } from "../../formatterFramework/FormatterHelper";
 
 @RegisterFormatter

src/v2/formatters/property/PropertyFormatter.ts → src/formatters/property/PropertyFormatter.ts

@@ -4,13 +4,10 @@ import { IFormatter } from "../../formatterFramework/IFormatter";
 import { CodeEdit } from "../../model/CodeEdit";
 import { FullText } from "../../model/FullText";
 import { AFormatter } from "../AFormatter";
-import {
-    definitionKeywords,
-    SyntaxNodeType,
-} from "../../../model/SyntaxNodeType";
+import { definitionKeywords, SyntaxNodeType } from "../../model/SyntaxNodeType";
 import { FormatterHelper } from "../../formatterFramework/FormatterHelper";
 import { PropertySettings } from "./PropertySettings";
-import { IConfigurationManager } from "../../../utils/IConfigurationManager";
+import { IConfigurationManager } from "../../utils/IConfigurationManager";
 
 @RegisterFormatter
 export class PropertyFormatter extends AFormatter implements IFormatter {

src/v2/formatters/statement/StatementFormatter.ts → src/formatters/statement/StatementFormatter.ts

@@ -4,10 +4,10 @@ import { IFormatter } from "../../formatterFramework/IFormatter";
 import { CodeEdit } from "../../model/CodeEdit";
 import { FullText } from "../../model/FullText";
 import { AFormatter } from "../AFormatter";
-import { SyntaxNodeType } from "../../../model/SyntaxNodeType";
+import { SyntaxNodeType } from "../../model/SyntaxNodeType";
 import { FormatterHelper } from "../../formatterFramework/FormatterHelper";
 import { StatementSettings } from "./StatementSettings";
-import { IConfigurationManager } from "../../../utils/IConfigurationManager";
+import { IConfigurationManager } from "../../utils/IConfigurationManager";
 
 @RegisterFormatter
 export class StatementFormatter extends AFormatter implements IFormatter {

src/v2/formatters/tempTable/TempTableFormatter.ts → src/formatters/tempTable/TempTableFormatter.ts

@@ -6,11 +6,8 @@ import { FullText } from "../../model/FullText";
 import { AFormatter } from "../AFormatter";
 import { FormatterHelper } from "../../formatterFramework/FormatterHelper";
 import { TempTableSettings } from "./TempTableSettings";
-import { IConfigurationManager } from "../../../utils/IConfigurationManager";
-import {
-    definitionKeywords,
-    SyntaxNodeType,
-} from "../../../model/SyntaxNodeType";
+import { IConfigurationManager } from "../../utils/IConfigurationManager";
+import { definitionKeywords, SyntaxNodeType } from "../../model/SyntaxNodeType";
 
 @RegisterFormatter
 export class TempTableFormatter extends AFormatter implements IFormatter {

src/v2/formatters/using/UsingFormatter.ts → src/formatters/using/UsingFormatter.ts

@@ -4,10 +4,10 @@ import { IFormatter } from "../../formatterFramework/IFormatter";
 import { CodeEdit } from "../../model/CodeEdit";
 import { FullText } from "../../model/FullText";
 import { AFormatter } from "../AFormatter";
-import { IConfigurationManager } from "../../../utils/IConfigurationManager";
+import { IConfigurationManager } from "../../utils/IConfigurationManager";
 import { FormatterHelper } from "../../formatterFramework/FormatterHelper";
 import { UsingSettings } from "./UsingSettings";
-import { SyntaxNodeType } from "../../../model/SyntaxNodeType";
+import { SyntaxNodeType } from "../../model/SyntaxNodeType";
 
 @RegisterFormatter
 export class UsingFormatter extends AFormatter implements IFormatter {

src/v2/formatters/variableDefinition/VariableDefinitionFormatter.ts → src/formatters/variableDefinition/VariableDefinitionFormatter.ts

@@ -4,12 +4,9 @@ import { IFormatter } from "../../formatterFramework/IFormatter";
 import { CodeEdit } from "../../model/CodeEdit";
 import { FullText } from "../../model/FullText";
 import { AFormatter } from "../AFormatter";
-import {
-    definitionKeywords,
-    SyntaxNodeType,
-} from "../../../model/SyntaxNodeType";
+import { definitionKeywords, SyntaxNodeType } from "../../model/SyntaxNodeType";
 import { VariableDefinitionSettings } from "./VariableDefinitionSettings";
-import { IConfigurationManager } from "../../../utils/IConfigurationManager";
+import { IConfigurationManager } from "../../utils/IConfigurationManager";
 import { FormatterHelper } from "../../formatterFramework/FormatterHelper";
 
 @RegisterFormatter

src/providers/AblFormatterProvider.ts

@@ -1,9 +1,9 @@
 import * as vscode from "vscode";
 import { IParserHelper } from "../parser/IParserHelper";
 import { FileIdentifier } from "../model/FileIdentifier";
-import { FormattingEngine } from "../v2/formatterFramework/FormattingEngine";
-import { ConfigurationManager2 } from "../utils/ConfigurationManager";
-import { EOL } from "../v2/model/EOL";
+import { FormattingEngine } from "../formatterFramework/FormattingEngine";
+import { ConfigurationManager } from "../utils/ConfigurationManager";
+import { EOL } from "../model/EOL";
 import { DebugManager } from "./DebugManager";
 
 export class AblFormatterProvider
@@ -23,7 +23,7 @@ export class AblFormatterProvider
     ): vscode.ProviderResult<vscode.TextEdit[]> {
         console.log("AblFormatterProvider.provideDocumentFormattingEdits");
 
-        const configurationManager = ConfigurationManager2.getInstance();
+        const configurationManager = ConfigurationManager.getInstance();
         const debugManager = DebugManager.getInstance();
 
         configurationManager.setTabSize(options.tabSize);
@@ -66,7 +66,7 @@ export class AblFormatterProvider
     ): vscode.ProviderResult<vscode.TextEdit[]> {
         console.log("AblFormatterProvider.provideDocumentFormattingEdits");
 
-        const configurationManager = ConfigurationManager2.getInstance();
+        const configurationManager = ConfigurationManager.getInstance();
         const debugManager = DebugManager.getInstance();
 
         try {