Skip to content

Commit 8acfc0e

Browse files
committed
updated tsconfig and corrected import path
1 parent a17c214 commit 8acfc0e

File tree

2 files changed

+27
-9
lines changed

2 files changed

+27
-9
lines changed

src/repository.ts

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ import {
1212
} from "vscode";
1313
import { Resource } from "./resource";
1414
import { throttle, debounce } from "./decorators";
15-
import { Repository as BaseRepository } from "./svn";
15+
import { Repository as BaseRepository } from "./svnRepository";
1616
import { SvnStatusBar } from "./statusBar";
1717
import { dispose, anyEvent, filterEvent } from "./util";
18-
import * as path from 'path';
18+
import * as path from "path";
1919

2020
export class Repository {
2121
public watcher: FileSystemWatcher;
@@ -28,7 +28,8 @@ export class Repository {
2828
public branches: any[] = [];
2929

3030
private _onDidChangeRepository = new EventEmitter<Uri>();
31-
readonly onDidChangeRepository: Event<Uri> = this._onDidChangeRepository.event;
31+
readonly onDidChangeRepository: Event<Uri> = this._onDidChangeRepository
32+
.event;
3233

3334
private _onDidChangeStatus = new EventEmitter<void>();
3435
readonly onDidChangeStatus: Event<void> = this._onDidChangeStatus.event;
@@ -49,13 +50,29 @@ export class Repository {
4950
const fsWatcher = workspace.createFileSystemWatcher("**");
5051
this.disposables.push(fsWatcher);
5152

52-
const onWorkspaceChange = anyEvent(fsWatcher.onDidChange, fsWatcher.onDidCreate, fsWatcher.onDidDelete);
53-
const onRepositoryChange = filterEvent(onWorkspaceChange, uri => !/^\.\./.test(path.relative(repository.root, uri.fsPath)));
54-
const onRelevantRepositoryChange = filterEvent(onRepositoryChange, uri => !/\/\.svn\/tmp/.test(uri.path));
53+
const onWorkspaceChange = anyEvent(
54+
fsWatcher.onDidChange,
55+
fsWatcher.onDidCreate,
56+
fsWatcher.onDidDelete
57+
);
58+
const onRepositoryChange = filterEvent(
59+
onWorkspaceChange,
60+
uri => !/^\.\./.test(path.relative(repository.root, uri.fsPath))
61+
);
62+
const onRelevantRepositoryChange = filterEvent(
63+
onRepositoryChange,
64+
uri => !/\/\.svn\/tmp/.test(uri.path)
65+
);
5566
onRelevantRepositoryChange(this.update, this, this.disposables);
5667

57-
const onRelevantSvnChange = filterEvent(onRelevantRepositoryChange, uri => /\/\.svn\//.test(uri.path));
58-
onRelevantSvnChange(this._onDidChangeRepository.fire, this._onDidChangeRepository, this.disposables);
68+
const onRelevantSvnChange = filterEvent(onRelevantRepositoryChange, uri =>
69+
/\/\.svn\//.test(uri.path)
70+
);
71+
onRelevantSvnChange(
72+
this._onDidChangeRepository.fire,
73+
this._onDidChangeRepository,
74+
this.disposables
75+
);
5976

6077
this.sourceControl = scm.createSourceControl(
6178
"svn",

tsconfig.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
"typeRoots": ["./node_modules/@types"],
88
"strict": true,
99
"experimentalDecorators": true,
10-
"sourceMap": true
10+
"sourceMap": true,
11+
"noImplicitThis": false
1112
},
1213
"include": ["src/**/*"],
1314
"exclude": ["node_modules"]

0 commit comments

Comments
 (0)