Skip to content

Commit fe0551e

Browse files
committed
fixed #6
1 parent 8ce00aa commit fe0551e

File tree

6 files changed

+21
-31
lines changed

6 files changed

+21
-31
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "vscode-tslint",
3-
"version": "1.4.2",
3+
"version": "1.5.0",
44
"description": "The umbrella project for the tslint client and server",
55
"main": " ",
66
"dependencies": {

tslint-server/package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tslint-server/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
"@types/node": "^6.0.41",
2020
"@types/semver": "^5.3.30",
2121
"mocha": "^3.3.0",
22-
"tslint": "^5.0.0",
23-
"typescript": "^2.0.3"
22+
"tslint": "^5.8.0",
23+
"typescript": "^2.6.2"
2424
},
2525
"scripts": {
2626
"compile": "installServerIntoExtension ../tslint ./package.json ./src/tsconfig.json && tsc -p ./src",

tslint-server/src/server.ts

Lines changed: 10 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -555,37 +555,26 @@ async function doValidate(conn: server.IConnection, library: any, document: serv
555555
function createProgram (updatedFileName: string, updatedContents: string, oldProgram?: ts.Program): ts.Program {
556556
const parsed = getParsedTsConfig();
557557
const host = ts.createCompilerHost(parsed.options, true);
558+
const realGetSourceFile = host.getSourceFile;
558559
updatedFileName = fixSlashes(updatedFileName);
559560

560561
host.getSourceFile = function getSourceFile(fileName, languageVersion, onError) {
561-
let sourceText: string | undefined;
562-
563562
if (updatedFileName && updatedFileName.indexOf(fixSlashes(encodePath(fileName))) !== -1) {
564563
// Get contents from file currently being edited in editor.
565-
sourceText = updatedContents;
564+
return ts.createSourceFile(fileName, updatedContents, languageVersion, true);
566565
} else {
567-
// Get contents from file on file system.
568-
sourceText = ts.sys.readFile(fileName);
566+
return realGetSourceFile(fileName, languageVersion, onError);
569567
}
570-
571-
// if (sourceText === undefined) console.log('File not found: ' + fileName);
572-
573-
return sourceText !== undefined ? ts.createSourceFile(fileName, sourceText, languageVersion) : undefined;
574568
}
575569

576-
host.fileExists = function fileExists(fileName) {
577-
return ts.sys.fileExists(fileName);
578-
};
579-
580-
host.readFile = function readFile(fileName) {
581-
return ts.sys.readFile(fileName);
582-
};
583-
584570
host.resolveModuleNames = function (moduleNames, containingFile) {
585571
const resolvedModules: ts.ResolvedModule[] = [];
586572
for (let moduleName of moduleNames) {
587573
// Try to use standard resolution.
588-
let result = ts.resolveModuleName(moduleName, containingFile, parsed.options, { fileExists: host.fileExists, readFile: host.readFile });
574+
let result = ts.resolveModuleName(moduleName, containingFile, parsed.options, {
575+
fileExists: host.fileExists, readFile: host.readFile
576+
});
577+
589578
if (result.resolvedModule) {
590579
resolvedModules.push(result.resolvedModule);
591580
}
@@ -619,16 +608,13 @@ function encodePath(path: string): string {
619608

620609
/**
621610
* Fixes a non .ts module's name so the file and source text can be properly found later.
622-
* Assumes wildcard "@" is [project root]/src.
611+
* Assumes wildcard "@" is [workspace root]/src.
623612
*/
624613
function resolveNonTsModuleName(moduleName: string, containingFile: string): string {
625614
if (moduleName.indexOf('@/') === 0) {
626-
moduleName = (workspacePath || '') + '/src' + moduleName.substr(1);
627-
}
628-
else if (moduleName.indexOf('./') === 0) {
629-
moduleName = path.dirname(containingFile) + moduleName.substr(1);
615+
moduleName = path.resolve(workspacePath || '', '/src' + moduleName.substr(1));
630616
}
631-
else if (moduleName.indexOf('../') === 0) {
617+
else if (moduleName.indexOf('./') === 0 || moduleName.indexOf('../') === 0) {
632618
moduleName = path.resolve(path.dirname(containingFile), moduleName);
633619
}
634620

tslint/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# 1.5.0
2+
- Fixed bug [#6](https://github.com/prograhammer/vscode-tslint-vue/issues/6) where rules in config were not applied.
3+
- Updated to TypeScript v2.6.2
4+
15
# 1.4.2
26
- Announce upcoming big release/fix. Update README.
37

tslint/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "tslint-vue",
33
"displayName": "TSLint Vue",
44
"description": "TSLint for Vue.js",
5-
"version": "1.4.2",
5+
"version": "1.5.0",
66
"author": "Microsoft Corporation",
77
"license": "MIT",
88
"publisher": "prograhammer",

0 commit comments

Comments
 (0)