Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

formatters moved from v2 #307

Merged
merged 2 commits into from
Feb 6, 2025
Merged

formatters moved from v2 #307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
03201e6
formatters moved from v2
darkeris345 Feb 5, 2025
c5d20eb
class name change
darkeris345 Feb 5, 2025
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
6 changes: 3 additions & 3 deletions src/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion ...v2/formatterFramework/FormatterFactory.ts → src/formatterFramework/FormatterFactory.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { IConfigurationManager } from "../../utils/IConfigurationManager";
import { IConfigurationManager } from "../utils/IConfigurationManager";
import { IFormatter } from "./IFormatter";
import { formatterRegistry } from "./formatterDecorator";

Expand Down
7 changes: 5 additions & 2 deletions src/v2/formatterFramework/FormatterHelper.ts → src/formatterFramework/FormatterHelper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down Expand Up @@ -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();
});

Expand Down
10 changes: 5 additions & 5 deletions ...v2/formatterFramework/FormattingEngine.ts → src/formatterFramework/FormattingEngine.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
0 src/v2/formatterFramework/IFormatter.ts → src/formatterFramework/IFormatter.ts
View file
Open in desktop
File renamed without changes.
0 ...terFramework/enableFormatterDecorators.ts → ...terFramework/enableFormatterDecorators.ts
View file
Open in desktop
File renamed without changes.
0 .../formatterFramework/formatterDecorator.ts → src/formatterFramework/formatterDecorator.ts
View file
Open in desktop
File renamed without changes.
13 changes: 8 additions & 5 deletions src/v2/formatters/AFormatter.ts → src/formatters/AFormatter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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";

Expand All @@ -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,
Expand All @@ -36,4 +39,4 @@ export abstract class AFormatter {
},
};
}
}
}
2 changes: 1 addition & 1 deletion src/v2/formatters/ASettings.ts → src/formatters/ASettings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { IConfigurationManager } from "../../utils/IConfigurationManager";
import { IConfigurationManager } from "../utils/IConfigurationManager";

export abstract class ASettings {
public constructor(
Expand Down
4 changes: 2 additions & 2 deletions ...tters/arrayAccess/ArrayAccessFormatter.ts → ...tters/arrayAccess/ArrayAccessFormatter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
0 ...atters/arrayAccess/ArrayAccessSettings.ts → ...atters/arrayAccess/ArrayAccessSettings.ts
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions src/v2/formatters/assign/AssignFormatter.ts → src/formatters/assign/AssignFormatter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
0 src/v2/formatters/assign/AssignSettings.ts → src/formatters/assign/AssignSettings.ts
View file
Open in desktop
File renamed without changes.
7 changes: 2 additions & 5 deletions src/v2/formatters/block/BlockFormatter.ts → src/formatters/block/BlockFormatter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
0 src/v2/formatters/block/BlockSettings.ts → src/formatters/block/BlockSettings.ts
View file
Open in desktop
File renamed without changes.
7 changes: 2 additions & 5 deletions src/v2/formatters/body/BodyFormatter.ts → src/formatters/body/BodyFormatter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0 src/v2/formatters/body/BodySettings.ts → src/formatters/body/BodySettings.ts
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions src/v2/formatters/case/CaseFormatter.ts → src/formatters/case/CaseFormatter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0 src/v2/formatters/case/CaseSettings.ts → src/formatters/case/CaseSettings.ts
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions src/v2/formatters/enum/EnumFormatter.ts → src/formatters/enum/EnumFormatter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0 src/v2/formatters/enum/EnumSettings.ts → src/formatters/enum/EnumSettings.ts
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...matters/expression/ExpressionFormatter.ts → ...matters/expression/ExpressionFormatter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0 ...rmatters/expression/ExpressionSettings.ts → ...rmatters/expression/ExpressionSettings.ts
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions src/v2/formatters/find/FindFormatter.ts → src/formatters/find/FindFormatter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
0 src/v2/formatters/find/FindSettings.ts → src/formatters/find/FindSettings.ts
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions src/v2/formatters/for/ForFormatter.ts → src/formatters/for/ForFormatter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
0 src/v2/formatters/for/ForSettings.ts → src/formatters/for/ForSettings.ts
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...onParameter/FunctionParameterFormatter.ts → ...onParameter/FunctionParameterFormatter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0 ...ionParameter/FunctionParameterSettings.ts → ...ionParameter/FunctionParameterSettings.ts
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions src/v2/formatters/if/IfFormatter.ts → src/formatters/if/IfFormatter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0 src/v2/formatters/if/IfSettings.ts → src/formatters/if/IfSettings.ts
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...matters/ifFunction/IfFunctionFormatter.ts → ...matters/ifFunction/IfFunctionFormatter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0 ...rmatters/ifFunction/IfFunctionSettings.ts → ...rmatters/ifFunction/IfFunctionSettings.ts
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...eParameter/ProcedureParameterFormatter.ts → ...eParameter/ProcedureParameterFormatter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0 ...reParameter/ProcedureParameterSettings.ts → ...reParameter/ProcedureParameterSettings.ts
View file
Open in desktop
File renamed without changes.
7 changes: 2 additions & 5 deletions .../formatters/property/PropertyFormatter.ts → src/formatters/property/PropertyFormatter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
0 ...2/formatters/property/PropertySettings.ts → src/formatters/property/PropertySettings.ts
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...ormatters/statement/StatementFormatter.ts → ...ormatters/statement/StatementFormatter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
0 ...formatters/statement/StatementSettings.ts → ...formatters/statement/StatementSettings.ts
View file
Open in desktop
File renamed without changes.
7 changes: 2 additions & 5 deletions ...ormatters/tempTable/TempTableFormatter.ts → ...ormatters/tempTable/TempTableFormatter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
0 ...formatters/tempTable/TempTableSettings.ts → ...formatters/tempTable/TempTableSettings.ts
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions src/v2/formatters/using/UsingFormatter.ts → src/formatters/using/UsingFormatter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
0 src/v2/formatters/using/UsingSettings.ts → src/formatters/using/UsingSettings.ts
View file
Open in desktop
File renamed without changes.
7 changes: 2 additions & 5 deletions ...Definition/VariableDefinitionFormatter.ts → ...Definition/VariableDefinitionFormatter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0 ...eDefinition/VariableDefinitionSettings.ts → ...eDefinition/VariableDefinitionSettings.ts
View file
Open in desktop
File renamed without changes.
0 src/v2/model/CodeEdit.ts → src/model/CodeEdit.ts
View file
Open in desktop
File renamed without changes.
0 src/v2/model/EOL.ts → src/model/EOL.ts
View file
Open in desktop
File renamed without changes.
0 src/v2/model/FullText.ts → src/model/FullText.ts
View file
Open in desktop
File renamed without changes.
10 changes: 5 additions & 5 deletions src/providers/AblFormatterProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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);
Expand Down Expand Up @@ -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 {
Expand Down
Loading
Loading