Skip to content

Commit 61f46e1

Browse files
JohnstonCodeJohnstonCode
authored
chore: code clean up (#815)
1 parent 3903d64 commit 61f46e1

File tree

12 files changed

+72
-94
lines changed

12 files changed

+72
-94
lines changed

‎src/extension.ts‎

Lines changed: 13 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -40,32 +40,22 @@ async function init(
4040
svn,
4141
ConstructorPolicy.Async
4242
);
43-
const contentProvider = new SvnContentProvider(sourceControlManager);
4443

4544
registerCommands(sourceControlManager, disposables);
4645

47-
disposables.push(sourceControlManager, contentProvider, tempSvnFs);
48-
49-
const svnProvider = new SvnProvider(sourceControlManager);
50-
51-
window.registerTreeDataProvider("svn", svnProvider);
52-
53-
const repoLogProvider = new RepoLogProvider(sourceControlManager);
54-
disposables.push(repoLogProvider);
55-
window.registerTreeDataProvider("repolog", repoLogProvider);
56-
57-
const itemLogProvider = new ItemLogProvider(sourceControlManager);
58-
disposables.push(itemLogProvider);
59-
window.registerTreeDataProvider("itemlog", itemLogProvider);
60-
61-
const branchChangesProvider = new BranchChangesProvider(sourceControlManager);
62-
disposables.push(branchChangesProvider);
63-
window.registerTreeDataProvider("branchchanges", branchChangesProvider);
64-
65-
disposables.push(new CheckActiveEditor(sourceControlManager));
66-
disposables.push(new OpenRepositoryCount(sourceControlManager));
67-
disposables.push(new IsSvn18orGreater(info.version));
68-
disposables.push(new IsSvn19orGreater(info.version));
46+
disposables.push(
47+
sourceControlManager,
48+
tempSvnFs,
49+
new SvnContentProvider(sourceControlManager),
50+
new SvnProvider(sourceControlManager),
51+
new RepoLogProvider(sourceControlManager),
52+
new ItemLogProvider(sourceControlManager),
53+
new BranchChangesProvider(sourceControlManager),
54+
new CheckActiveEditor(sourceControlManager),
55+
new OpenRepositoryCount(sourceControlManager),
56+
new IsSvn18orGreater(info.version),
57+
new IsSvn19orGreater(info.version)
58+
);
6959

7060
outputChannel.appendLine(`Using svn "${info.version}" from "${info.path}"`);
7161

‎src/historyView/branchChangesProvider.ts‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ import {
33
Disposable,
44
TreeItem,
55
commands,
6-
EventEmitter
6+
EventEmitter,
7+
window
78
} from "vscode";
89
import { SourceControlManager } from "../source_control_manager";
910
import { ISvnPathChange, Status } from "../common/types";
@@ -18,22 +19,19 @@ export class BranchChangesProvider
1819

1920
constructor(private model: SourceControlManager) {
2021
this._dispose.push(
22+
window.registerTreeDataProvider("branchchanges", this),
2123
commands.registerCommand(
2224
"svn.branchchanges.openDiff",
2325
this.openDiffCmd,
2426
this
25-
)
26-
);
27-
28-
this._dispose.push(
27+
),
2928
commands.registerCommand(
3029
"svn.branchchanges.refresh",
3130
() => this._onDidChangeTreeData.fire(),
3231
this
33-
)
32+
),
33+
this.model.onDidChangeRepository(() => this._onDidChangeTreeData.fire())
3434
);
35-
36-
this.model.onDidChangeRepository(() => this._onDidChangeTreeData.fire());
3735
}
3836

3937
dispose() {

‎src/historyView/itemLogProvider.ts‎

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -44,37 +44,28 @@ export class ItemLogProvider
4444
private _dispose: Disposable[] = [];
4545

4646
constructor(private sourceControlManager: SourceControlManager) {
47-
window.onDidChangeActiveTextEditor(this.editorChanged, this);
4847
this._dispose.push(
48+
window.onDidChangeActiveTextEditor(this.editorChanged, this),
49+
window.registerTreeDataProvider("itemlog", this),
4950
commands.registerCommand(
5051
"svn.itemlog.copymsg",
5152
async (item: ILogTreeItem) => copyCommitToClipboard("msg", item)
52-
)
53-
);
54-
this._dispose.push(
53+
),
5554
commands.registerCommand(
5655
"svn.itemlog.copyrevision",
5756
async (item: ILogTreeItem) => copyCommitToClipboard("revision", item)
58-
)
59-
);
60-
this._dispose.push(
57+
),
6158
commands.registerCommand(
6259
"svn.itemlog.openFileRemote",
6360
this.openFileRemoteCmd,
6461
this
65-
)
66-
);
67-
this._dispose.push(
68-
commands.registerCommand("svn.itemlog.openDiff", this.openDiffCmd, this)
69-
);
70-
this._dispose.push(
62+
),
63+
commands.registerCommand("svn.itemlog.openDiff", this.openDiffCmd, this),
7164
commands.registerCommand(
7265
"svn.itemlog.openDiffBase",
7366
this.openDiffBaseCmd,
7467
this
75-
)
76-
);
77-
this._dispose.push(
68+
),
7869
commands.registerCommand("svn.itemlog.refresh", this.refresh, this)
7970
);
8071
this.refresh();

‎src/historyView/repoLogProvider.ts‎

Lines changed: 14 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -85,53 +85,40 @@ export class RepoLogProvider
8585
constructor(private sourceControlManager: SourceControlManager) {
8686
this.refresh();
8787
this._dispose.push(
88+
window.registerTreeDataProvider("repolog", this),
8889
commands.registerCommand(
8990
"svn.repolog.copymsg",
9091
async (item: ILogTreeItem) => copyCommitToClipboard("msg", item)
91-
)
92-
);
93-
this._dispose.push(
92+
),
9493
commands.registerCommand(
9594
"svn.repolog.copyrevision",
9695
async (item: ILogTreeItem) => copyCommitToClipboard("revision", item)
97-
)
98-
);
99-
this._dispose.push(
96+
),
10097
commands.registerCommand(
10198
"svn.repolog.addrepolike",
10299
this.addRepolikeGui,
103100
this
104-
)
105-
);
106-
this._dispose.push(
107-
commands.registerCommand("svn.repolog.remove", this.removeRepo, this)
108-
);
109-
this._dispose.push(
101+
),
102+
commands.registerCommand("svn.repolog.remove", this.removeRepo, this),
110103
commands.registerCommand(
111104
"svn.repolog.openFileRemote",
112105
this.openFileRemoteCmd,
113106
this
114-
)
115-
);
116-
this._dispose.push(
117-
commands.registerCommand("svn.repolog.openDiff", this.openDiffCmd, this)
118-
);
119-
this._dispose.push(
107+
),
108+
commands.registerCommand("svn.repolog.openDiff", this.openDiffCmd, this),
120109
commands.registerCommand(
121110
"svn.repolog.openFileLocal",
122111
this.openFileLocal,
123112
this
113+
),
114+
commands.registerCommand("svn.repolog.refresh", this.refresh, this),
115+
this.sourceControlManager.onDidChangeRepository(
116+
async (_e: RepositoryChangeEvent) => {
117+
return this.refresh();
118+
// TODO refresh only required repo, need to pass element === getChildren()
119+
}
124120
)
125121
);
126-
this._dispose.push(
127-
commands.registerCommand("svn.repolog.refresh", this.refresh, this)
128-
);
129-
this.sourceControlManager.onDidChangeRepository(
130-
async (_e: RepositoryChangeEvent) => {
131-
return this.refresh();
132-
// TODO refresh only required repo, need to pass element === getChildren()
133-
}
134-
);
135122
}
136123

137124
public dispose() {

src/diffParser.ts renamed to src/parser/diffParser.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { ISvnPath } from "./common/types";
1+
import { ISvnPath } from "../common/types";
22
import * as xml2js from "xml2js";
3-
import { camelcase } from "./util";
3+
import { camelcase } from "../util";
44

55
export async function parseDiffXml(content: string): Promise<ISvnPath[]> {
66
return new Promise<ISvnPath[]>((resolve, reject) => {

src/infoParser.ts renamed to src/parser/infoParser.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as xml2js from "xml2js";
2-
import { ISvnInfo } from "./common/types";
3-
import { camelcase } from "./util";
2+
import { ISvnInfo } from "../common/types";
3+
import { camelcase } from "../util";
44

55
export async function parseInfoXml(content: string): Promise<ISvnInfo> {
66
return new Promise<ISvnInfo>((resolve, reject) => {

src/listParser.ts renamed to src/parser/listParser.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as xml2js from "xml2js";
2-
import { xml2jsParseSettings } from "./common/constants";
3-
import { ISvnListItem } from "./common/types";
2+
import { xml2jsParseSettings } from "../common/constants";
3+
import { ISvnListItem } from "../common/types";
44

55
export async function parseSvnList(content: string): Promise<ISvnListItem[]> {
66
return new Promise<ISvnListItem[]>((resolve, reject) => {

src/logParser.ts renamed to src/parser/logParser.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as xml2js from "xml2js";
2-
import { xml2jsParseSettings } from "./common/constants";
3-
import { ISvnLogEntry } from "./common/types";
2+
import { xml2jsParseSettings } from "../common/constants";
3+
import { ISvnLogEntry } from "../common/types";
44

55
export async function parseSvnLog(content: string): Promise<ISvnLogEntry[]> {
66
return new Promise<ISvnLogEntry[]>((resolve, reject) => {

src/statusParser.ts renamed to src/parser/statusParser.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as xml2js from "xml2js";
2-
import { xml2jsParseSettings } from "./common/constants";
3-
import { IEntry, IFileStatus, IWcStatus } from "./common/types";
2+
import { xml2jsParseSettings } from "../common/constants";
3+
import { IEntry, IFileStatus, IWcStatus } from "../common/types";
44

55
function processEntry(
66
entry: IEntry | IEntry[],

‎src/svn.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {
1010
} from "./common/types";
1111
import * as encodeUtil from "./encoding";
1212
import { configuration } from "./helpers/configuration";
13-
import { parseInfoXml } from "./infoParser";
13+
import { parseInfoXml } from "./parser/infoParser";
1414
import SvnError from "./svnError";
1515
import { Repository } from "./svnRepository";
1616
import { dispose, IDisposable, toDisposable } from "./util";

0 commit comments

Comments
 (0)