Skip to content

Commit 747f7d2

Browse files
committed
chore(typescript) update to latest + build + fix any compile errors
1 parent 1f4d7ea commit 747f7d2

File tree

15 files changed

+45
-61
lines changed

15 files changed

+45
-61
lines changed

dist/main/atom/views/dependencyView.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ function renderGraph(dependencies, mainContent, display) {
8888
var cycles = d3Graph.cycles();
8989
var message = '';
9090
var textContent = '';
91-
for (var _i = 0; _i < cycles.length; _i++) {
92-
var cycle = cycles[_i];
91+
for (var _i = 0, cycles_1 = cycles; _i < cycles_1.length; _i++) {
92+
var cycle = cycles_1[_i];
9393
message += '<h3>Cycle Found: </h3>';
9494
message += cycle.join(' <br/> ') + '<br/>';
9595
textContent += '---Cycle Found---' + os.EOL;

dist/main/atom/views/mainPanelView.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -295,8 +295,8 @@ var MainPanelView = (function (_super) {
295295
var title = panelHeaders.references + " ( <span class=\"text-highlight\" style=\"font-weight: bold\">Found: " + references.length + "</span> )";
296296
this.referencesPanelBtn.html(title);
297297
gotoHistory.referencesOutput.members = [];
298-
for (var _i = 0; _i < references.length; _i++) {
299-
var ref = references[_i];
298+
for (var _i = 0, references_1 = references; _i < references_1.length; _i++) {
299+
var ref = references_1[_i];
300300
var view = new lineMessageView.LineMessageView({
301301
goToLine: function (filePath, line, col) { return gotoHistory.gotoLine(filePath, line, col, gotoHistory.referencesOutput); },
302302
message: '',

dist/main/lang/fixmyts/quickFix.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
function getRefactoringsByFilePath(refactorings) {
22
var loc = {};
3-
for (var _i = 0; _i < refactorings.length; _i++) {
4-
var refac = refactorings[_i];
3+
for (var _i = 0, refactorings_1 = refactorings; _i < refactorings_1.length; _i++) {
4+
var refac = refactorings_1[_i];
55
if (!loc[refac.filePath])
66
loc[refac.filePath] = [];
77
loc[refac.filePath].push(refac);
88
}
99
for (var filePath in loc) {
10-
var refactorings_1 = loc[filePath];
11-
refactorings_1.sort(function (a, b) {
10+
var refactorings_2 = loc[filePath];
11+
refactorings_2.sort(function (a, b) {
1212
return (b.span.start - a.span.start);
1313
});
1414
}

dist/main/lang/fixmyts/quickFixes/extractVariable.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ var ExtractVariable = (function () {
1313
}, function () {
1414
return { display: "Extract variable" };
1515
});
16-
throw "Unexpected state in canProvideFix";
1716
};
1817
ExtractVariable.prototype.provideFix = function (info) {
1918
return execute(info, function () {
@@ -23,7 +22,6 @@ var ExtractVariable = (function () {
2322
}, function (callExpression) {
2423
return extractVariableFromArg(info, callExpression);
2524
});
26-
throw "Unexpected state in provideFix";
2725
};
2826
return ExtractVariable;
2927
})();

dist/main/lang/modules/moveFiles.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ function getRenameFilesRefactorings(program, oldDirectoryOrFile, newDirectoryOrF
2020
});
2121
var matches = imports.filter(function (f) { return f.path == oldFileNoExt; });
2222
if (matches.length) {
23-
for (var _i = 0; _i < matches.length; _i++) {
24-
var match = matches[_i];
23+
for (var _i = 0, matches_1 = matches; _i < matches_1.length; _i++) {
24+
var match = matches_1[_i];
2525
refactorings.push({
2626
filePath: sourceFile.fileName,
2727
span: {

dist/main/lang/modules/programDependencies.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ function getDependencies(projectFile, program) {
1919
}
2020
return file;
2121
});
22-
for (var _b = 0; _b < targets.length; _b++) {
23-
var target = targets[_b];
22+
for (var _b = 0, targets_1 = targets; _b < targets_1.length; _b++) {
23+
var target = targets_1[_b];
2424
var targetPath = fsUtil_1.consistentPath(path.relative(projectDir, fsUtil_1.consistentPath(target)));
2525
var sourcePath = fsUtil_1.consistentPath(path.relative(projectDir, filePath));
2626
links.push({

dist/main/lang/projectService.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -334,8 +334,8 @@ function getProjectFileDetails(query) {
334334
exports.getProjectFileDetails = getProjectFileDetails;
335335
function sortNavbarItemsBySpan(items) {
336336
items.sort(function (a, b) { return a.spans[0].start - b.spans[0].start; });
337-
for (var _i = 0; _i < items.length; _i++) {
338-
var item = items[_i];
337+
for (var _i = 0, items_1 = items; _i < items_1.length; _i++) {
338+
var item = items_1[_i];
339339
if (item.childItems) {
340340
sortNavbarItemsBySpan(item.childItems);
341341
}

dist/main/lang/transformers/transformerRegistry.js

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,6 @@ var transformFinderRegex = /transform:(.*){/g;
1616
var transformEndFinderRegexGenerator = function (name) { return new RegExp("}transform:" + name); };
1717
function getInitialTransformation(code) {
1818
var transforms = [];
19-
var processedSrcUpto = 0;
20-
var srcCode = code;
21-
var destCode = '';
22-
var destDelta = 0;
23-
while (true) {
24-
var remainingCode = code.substr(processedSrcUpto);
25-
var matches = transformFinderRegex.exec(remainingCode);
26-
if (!matches || !matches.length || matches.length < 2)
27-
return { transforms: transforms };
28-
var nextTransformName = matches.slice[1];
29-
}
3019
return { transforms: transforms };
3120
}
3221
exports.getInitialTransformation = getInitialTransformation;

dist/main/tsconfig/tsconfig.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -370,8 +370,8 @@ function getDefinitionsForNodeModules(projectDir, files) {
370370
try {
371371
var node_modules = travelUpTheDirectoryTreeTillYouFind(projectDir, 'node_modules', true);
372372
var moduleDirs = getDirs(node_modules);
373-
for (var _i = 0; _i < moduleDirs.length; _i++) {
374-
var moduleDir = moduleDirs[_i];
373+
for (var _i = 0, moduleDirs_1 = moduleDirs; _i < moduleDirs_1.length; _i++) {
374+
var moduleDir = moduleDirs_1[_i];
375375
try {
376376
var package_json = JSON.parse(fs.readFileSync(moduleDir + "/package.json").toString());
377377
packagejson.push(moduleDir + "/package.json");
@@ -496,8 +496,8 @@ exports.getPotentiallyRelativeFile = getPotentiallyRelativeFile;
496496
function getDirs(rootDir) {
497497
var files = fs.readdirSync(rootDir);
498498
var dirs = [];
499-
for (var _i = 0; _i < files.length; _i++) {
500-
var file = files[_i];
499+
for (var _i = 0, files_1 = files; _i < files_1.length; _i++) {
500+
var file = files_1[_i];
501501
if (file[0] != '.') {
502502
var filePath = rootDir + "/" + file;
503503
var stat = fs.statSync(filePath);

dist/worker/lib/workerLib.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ var orphanExitCode = 100;
1717
var RequesterResponder = (function () {
1818
function RequesterResponder() {
1919
var _this = this;
20-
this.getProcess = function () { throw new Error('getProcess is abstract'); return null; };
2120
this.currentListeners = {};
2221
this.currentLastOfType = {};
2322
this.pendingRequests = [];

lib/main/lang/fixmyts/quickFixes/extractVariable.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ export class ExtractVariable implements QuickFix {
1919
() => {
2020
return { display: `Extract variable` };
2121
});
22-
23-
throw "Unexpected state in canProvideFix";
24-
2522
}
2623

2724
provideFix(info: QuickFixQueryInformation): Refactoring[] {
@@ -36,8 +33,6 @@ export class ExtractVariable implements QuickFix {
3633
(callExpression) => {
3734
return extractVariableFromArg(info, callExpression);
3835
});
39-
40-
throw "Unexpected state in provideFix";
4136
}
4237

4338
}

lib/main/lang/transformers/transformerRegistry.ts

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -30,27 +30,28 @@ export function getInitialTransformation(code: string): FileTransformationDetail
3030

3131

3232
var transforms: TransformerDelimiter[] = [];
33-
var processedSrcUpto = 0;
34-
var srcCode = code;
35-
var destCode = '';
36-
var destDelta = 0;
37-
38-
while (true) {
39-
let remainingCode = code.substr(processedSrcUpto);
40-
// Get the next transform that exist in this file:
41-
var matches = transformFinderRegex.exec(remainingCode);
42-
// No more transforms:
43-
if (!matches || !matches.length || matches.length < 2) return { transforms };
44-
// Found one!
45-
var nextTransformName = matches.slice[1];
46-
// Update the processedUpto
47-
}
48-
49-
/**
50-
* TODO: for each transform we note down the src start and src end
51-
* Then we transform the src code. This gives a dest start (initially same as src start) and dest end (more or less)
52-
* we use this to additionally compute a running (delta) in dest. This delta is used in the next (dest start).
53-
*/
33+
// var processedSrcUpto = 0;
34+
// var srcCode = code;
35+
// var destCode = '';
36+
// var destDelta = 0;
37+
//
38+
// while (true) {
39+
// let remainingCode = code.substr(processedSrcUpto);
40+
// // Get the next transform that exist in this file:
41+
// var matches = transformFinderRegex.exec(remainingCode);
42+
// // No more transforms:
43+
// if (!matches || !matches.length || matches.length < 2) return { transforms };
44+
// // Found one!
45+
// var nextTransformName = matches.slice[1];
46+
// // Update the processedUpto
47+
// break;
48+
// }
49+
//
50+
// /**
51+
// * TODO: for each transform we note down the src start and src end
52+
// * Then we transform the src code. This gives a dest start (initially same as src start) and dest end (more or less)
53+
// * we use this to additionally compute a running (delta) in dest. This delta is used in the next (dest start).
54+
// */
5455

5556

5657
return { transforms };

lib/typings/atompromise.d.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,3 +96,7 @@ interface PromiseDeferred<T> {
9696
}
9797

9898
declare var Promise: PromiseConstructor;
99+
100+
declare module 'pinkie-promise'{
101+
export = Promise;
102+
}

lib/worker/lib/workerLib.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@ class RequesterResponder {
4242
protected getProcess: {
4343
(): { send?: <T>(message: Message<T>) => any }
4444
}
45-
= () => { throw new Error('getProcess is abstract'); return null; }
46-
4745

4846
///////////////////////////////// REQUESTOR /////////////////////////
4947

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"immutable": "^3.7.3",
5555
"json2dts": "0.0.1",
5656
"mkdirp": "^0.5.0",
57-
"ntypescript": "1.201510270605.1",
57+
"ntypescript": "1.201511100604.1",
5858
"react": "^0.13.3",
5959
"season": "^5.1.4",
6060
"tsconfig": "^2.1.0",

0 commit comments

Comments
 (0)