Skip to content

Commit d242f53

Browse files
basaratbasarat
committed
feat(typescript) update to typescript latest
1 parent 55c47cd commit d242f53

File tree

12 files changed

+71
-50
lines changed

12 files changed

+71
-50
lines changed

‎dist/main/atom/commands/commands.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,11 +174,11 @@ function registerCommands() {
174174
atom.notifications.addInfo('AtomTS: Can only rename external modules if they are relative files!');
175175
return;
176176
}
177-
var completePath = path.resolve(path.dirname(atomUtils.getCurrentPath()), relativePath) + '.ts';
177+
var completePath_1 = path.resolve(path.dirname(atomUtils.getCurrentPath()), relativePath) + '.ts';
178178
renameView.panelView.renameThis({
179179
autoSelect: false,
180180
title: 'Rename File',
181-
text: completePath,
181+
text: completePath_1,
182182
openFiles: [],
183183
closedFiles: [],
184184
onCancel: function () { },
@@ -190,7 +190,7 @@ function registerCommands() {
190190
},
191191
onCommit: function (newText) {
192192
newText = newText.trim();
193-
parent.getRenameFilesRefactorings({ oldPath: completePath, newPath: newText })
193+
parent.getRenameFilesRefactorings({ oldPath: completePath_1, newPath: newText })
194194
.then(function (res) {
195195
applyRefactorings(res.refactorings);
196196
});

‎dist/main/atom/typescriptGrammar.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ var TypeScriptSemanticGrammar = (function (_super) {
138138
var style = getAtomStyleForToken(info, str);
139139
if (style == 'comment.block') {
140140
var toret = [];
141-
var match;
141+
var match = void 0;
142142
while (match = _this.todoRegex.exec(str)) {
143143
var start = match.index;
144144
var length = match[1].length;

‎dist/main/atom/views/dependencyView.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,17 +88,17 @@ function renderGraph(dependencies, mainContent, display) {
8888
if (d3Graph.cycles().length) {
8989
var cycles = d3Graph.cycles();
9090
var message = '';
91-
var textContent = '';
91+
var textContent_1 = '';
9292
for (var _i = 0, cycles_1 = cycles; _i < cycles_1.length; _i++) {
9393
var cycle = cycles_1[_i];
9494
message += '<h3>Cycle Found: </h3>';
9595
message += cycle.join(' <br/> ') + '<br/>';
96-
textContent += '---Cycle Found---' + os.EOL;
97-
textContent += cycle.join(os.EOL) + os.EOL;
96+
textContent_1 += '---Cycle Found---' + os.EOL;
97+
textContent_1 += cycle.join(os.EOL) + os.EOL;
9898
}
9999
messagesElement.html(message);
100100
copyDisplay.show().on('click', function () {
101-
atom.clipboard.write(textContent);
101+
atom.clipboard.write(textContent_1);
102102
atom.notifications.addInfo('Copied!');
103103
});
104104
}

‎dist/main/lang/fixmyts/quickFixes/addClassMember.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,13 @@ var AddClassMember = (function () {
5252
else if (parentOfParent.kind == ts.SyntaxKind.CallExpression) {
5353
var callExp = parentOfParent;
5454
var typeStringParts = ['('];
55-
var args = [];
55+
var args_1 = [];
5656
callExp.arguments.forEach(function (arg) {
5757
var argName = (getLastNameAfterDot(arg.getText()));
5858
var argType = getTypeStringForNode(arg, info.typeChecker);
59-
args.push(argName + ": " + argType);
59+
args_1.push(argName + ": " + argType);
6060
});
61-
typeStringParts.push(args.join(', '));
61+
typeStringParts.push(args_1.join(', '));
6262
typeStringParts.push(') => any');
6363
typeString = typeStringParts.join('');
6464
}

‎dist/main/lang/fixmyts/quickFixes/addClassMethod.js

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -50,18 +50,18 @@ var AddClassMethod = (function () {
5050
typeString = getTypeStringForNode(binaryExpression.right, info.typeChecker);
5151
}
5252
else if (parentOfParent.kind == ts.SyntaxKind.CallExpression) {
53-
var nativeTypes = ['string', 'number', 'boolean', 'object', 'null', 'undefined', 'RegExp'];
54-
var abc = 'abcdefghijklmnopqrstuvwxyz';
55-
var argsAlphabet = abc.split('');
56-
var argsAlphabetPosition = 0;
57-
var argName = '';
58-
var argCount = 0;
53+
var nativeTypes_1 = ['string', 'number', 'boolean', 'object', 'null', 'undefined', 'RegExp'];
54+
var abc_1 = 'abcdefghijklmnopqrstuvwxyz';
55+
var argsAlphabet_1 = abc_1.split('');
56+
var argsAlphabetPosition_1 = 0;
57+
var argName_1 = '';
58+
var argCount_1 = 0;
5959
var callExp = parentOfParent;
6060
var typeStringParts = ['('];
61-
var args = [];
61+
var args_1 = [];
6262
callExp.arguments.forEach(function (arg) {
6363
var argType = getTypeStringForNode(arg, info.typeChecker);
64-
if (nativeTypes.indexOf(argType) != -1
64+
if (nativeTypes_1.indexOf(argType) != -1
6565
|| argType.indexOf('{') != -1
6666
|| argType.indexOf('=>') != -1
6767
|| argType.indexOf('[]') != -1) {
@@ -83,48 +83,48 @@ var AddClassMethod = (function () {
8383
!isAnonymousObject) {
8484
if (typeName == 'Array')
8585
typeName = 'array';
86-
argName = "" + typeName + argCount++;
86+
argName_1 = "" + typeName + argCount_1++;
8787
}
8888
else if (argType.indexOf('[]') != -1) {
89-
argName = "array" + argCount++;
89+
argName_1 = "array" + argCount_1++;
9090
}
9191
else {
9292
if (isAnonymousMethod) {
9393
typeName = "function";
94-
argName = "" + typeName + argCount++;
94+
argName_1 = "" + typeName + argCount_1++;
9595
}
9696
else if (isAnonymousObject) {
9797
typeName = "object";
98-
argName = "" + typeName + argCount++;
98+
argName_1 = "" + typeName + argCount_1++;
9999
}
100100
else {
101-
argName = argsAlphabet[argsAlphabetPosition];
102-
argsAlphabet[argsAlphabetPosition] += argsAlphabet[argsAlphabetPosition].substring(1);
103-
argsAlphabetPosition++;
104-
argsAlphabetPosition %= abc.length;
101+
argName_1 = argsAlphabet_1[argsAlphabetPosition_1];
102+
argsAlphabet_1[argsAlphabetPosition_1] += argsAlphabet_1[argsAlphabetPosition_1].substring(1);
103+
argsAlphabetPosition_1++;
104+
argsAlphabetPosition_1 %= abc_1.length;
105105
}
106106
}
107107
}
108108
else {
109-
argName = argType.replace('typeof ', '');
109+
argName_1 = argType.replace('typeof ', '');
110110
if (argType.indexOf('typeof ') == -1) {
111-
var firstLower = argName[0].toLowerCase();
112-
if (argName.length == 1) {
113-
argName = firstLower;
111+
var firstLower = argName_1[0].toLowerCase();
112+
if (argName_1.length == 1) {
113+
argName_1 = firstLower;
114114
}
115115
else {
116-
argName = firstLower + argName.substring(1);
116+
argName_1 = firstLower + argName_1.substring(1);
117117
}
118118
}
119-
argName += argCount.toString();
120-
argCount++;
119+
argName_1 += argCount_1.toString();
120+
argCount_1++;
121121
}
122122
if (argType.indexOf('null') != -1 || argType.indexOf('undefined') != -1) {
123123
argType = argType.replace(/null|undefined/g, 'any');
124124
}
125-
args.push(argName + ": " + argType);
125+
args_1.push(argName_1 + ": " + argType);
126126
});
127-
typeStringParts.push(args.join(', '));
127+
typeStringParts.push(args_1.join(', '));
128128
typeStringParts.push("): any { }");
129129
typeString = typeStringParts.join('');
130130
}

‎dist/main/lang/modules/building.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ function emitFile(proj, filePath) {
3737
errors.push(diagnosticToTSError(diagnostic));
3838
});
3939
{
40-
var sourceMapContents = {};
40+
var sourceMapContents_1 = {};
4141
output.outputFiles.forEach(function (o) {
4242
mkdirp.sync(path.dirname(o.name));
43-
runExternalTranspiler(filePath, sourceFile.text, o, proj, sourceMapContents).then(function (additionalEmits) {
44-
if (!sourceMapContents[o.name] && !proj.projectFile.project.compilerOptions.noEmit) {
43+
runExternalTranspiler(filePath, sourceFile.text, o, proj, sourceMapContents_1).then(function (additionalEmits) {
44+
if (!sourceMapContents_1[o.name] && !proj.projectFile.project.compilerOptions.noEmit) {
4545
fs.writeFileSync(o.name, o.text, "utf8");
4646
}
4747
additionalEmits.forEach(function (a) {

‎dist/main/lang/projectService.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ function errorsForFile(query) {
263263
return resolve({ errors: errors });
264264
}
265265
else {
266-
var result;
266+
var result = void 0;
267267
if (project.includesSourceFile(query.filePath)) {
268268
result = getDiagnositcsByFilePath(query).map(building.diagnosticToTSError);
269269
}

‎dist/main/tsconfig/dts-generator.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,10 @@ function generate(options, sendMessage) {
9898
output.on('close', function () { resolve(undefined); });
9999
output.on('error', reject);
100100
if (options.externs) {
101-
var relativeRoot = pathUtil.dirname(options.out);
101+
var relativeRoot_1 = pathUtil.dirname(options.out);
102102
options.externs.forEach(function (path) {
103103
sendMessage("Writing external dependency " + path);
104-
output.write("/// <reference path=\"" + makeRelativePath(relativeRoot, path) + "\" />" + eol);
104+
output.write("/// <reference path=\"" + makeRelativePath(relativeRoot_1, path) + "\" />" + eol);
105105
});
106106
}
107107
program.getSourceFiles().some(function (sourceFile) {

‎dist/main/tsconfig/formatting.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@ function defaultFormatCodeOptions() {
1212
InsertSpaceBeforeAndAfterBinaryOperators: true,
1313
InsertSpaceAfterKeywordsInControlFlowStatements: true,
1414
InsertSpaceAfterFunctionKeywordForAnonymousFunctions: false,
15-
InsertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets: false,
1615
InsertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis: false,
16+
InsertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets: false,
17+
InsertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces: false,
1718
PlaceOpenBraceOnNewLineForFunctions: false,
1819
PlaceOpenBraceOnNewLineForControlBlocks: false,
1920
};
@@ -42,6 +43,12 @@ function makeFormatCodeOptions(config) {
4243
if (typeof config.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis === "boolean") {
4344
options.InsertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis = config.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis;
4445
}
46+
if (typeof config.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets === "boolean") {
47+
options.InsertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets = config.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets;
48+
}
49+
if (typeof config.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces === "boolean") {
50+
options.InsertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces = config.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces;
51+
}
4552
if (typeof config.placeOpenBraceOnNewLineForFunctions === "boolean") {
4653
options.PlaceOpenBraceOnNewLineForFunctions = config.placeOpenBraceOnNewLineForFunctions;
4754
}

‎dist/worker/lib/workerLib.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,10 @@ var RequesterResponder = (function () {
9393
}
9494
delete this.currentListeners[parsed.message][parsed.id];
9595
if (this.currentLastOfType[parsed.message]) {
96-
var last = this.currentLastOfType[parsed.message];
96+
var last_1 = this.currentLastOfType[parsed.message];
9797
delete this.currentLastOfType[parsed.message];
98-
var lastPromise = this.sendToIpcHeart(last.data, parsed.message);
99-
lastPromise.then(function (res) { return last.defer.resolve(res); }, function (rej) { return last.defer.reject(rej); });
98+
var lastPromise = this.sendToIpcHeart(last_1.data, parsed.message);
99+
lastPromise.then(function (res) { return last_1.defer.resolve(res); }, function (rej) { return last_1.defer.reject(rej); });
100100
}
101101
}
102102
};

‎lib/main/tsconfig/formatting.ts

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1-
1+
/**
2+
* Maintainance:
3+
* When a new option is added add it to:
4+
* - the FormatCodeOptions interface
5+
* - the defaultFormatCodeOptions function
6+
* - the makeFormatCodeOptions function
7+
*/
28

39
import os = require('os');
410

@@ -16,6 +22,8 @@ export interface FormatCodeOptions extends EditorOptions {
1622
insertSpaceAfterKeywordsInControlFlowStatements: boolean;
1723
insertSpaceAfterFunctionKeywordForAnonymousFunctions: boolean;
1824
insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis: boolean;
25+
insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets: boolean;
26+
insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces: boolean;
1927
placeOpenBraceOnNewLineForFunctions: boolean;
2028
placeOpenBraceOnNewLineForControlBlocks: boolean;
2129
}
@@ -32,14 +40,14 @@ export function defaultFormatCodeOptions(): ts.FormatCodeOptions {
3240
InsertSpaceBeforeAndAfterBinaryOperators: true,
3341
InsertSpaceAfterKeywordsInControlFlowStatements: true,
3442
InsertSpaceAfterFunctionKeywordForAnonymousFunctions: false,
35-
InsertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets: false,
3643
InsertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis: false,
44+
InsertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets: false,
45+
InsertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces: false,
3746
PlaceOpenBraceOnNewLineForFunctions: false,
3847
PlaceOpenBraceOnNewLineForControlBlocks: false,
3948
};
4049
}
4150

42-
4351
export function makeFormatCodeOptions(config: FormatCodeOptions): ts.FormatCodeOptions {
4452
var options = defaultFormatCodeOptions();
4553
if (!config) {
@@ -63,6 +71,12 @@ export function makeFormatCodeOptions(config: FormatCodeOptions): ts.FormatCodeO
6371
if (typeof config.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis === "boolean") {
6472
options.InsertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis = config.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis;
6573
}
74+
if (typeof config.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets === "boolean") {
75+
options.InsertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets = config.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets;
76+
}
77+
if (typeof config.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces === "boolean") {
78+
options.InsertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces = config.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces;
79+
}
6680
if (typeof config.placeOpenBraceOnNewLineForFunctions === "boolean") {
6781
options.PlaceOpenBraceOnNewLineForFunctions = config.placeOpenBraceOnNewLineForFunctions;
6882
}

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
"immutable": "^3.7.3",
6161
"json2dts": "0.0.1",
6262
"mkdirp": "^0.5.0",
63-
"ntypescript": "1.201601010604.1",
63+
"ntypescript": "1.201601272211.1",
6464
"react": "^0.13.3",
6565
"season": "^5.1.4",
6666
"tsconfig": "^2.2.0",

0 commit comments

Comments
 (0)