Merge branch 'master' into modularize

Author: weswigham

.travis.yml

@@ -2,3 +2,4 @@ language: node_js
 node_js:
     - "0.10"
     - "0.12"
+    - "4.1"

appveyor.yml

@@ -2,6 +2,7 @@ environment:
   matrix:
   - nodejs_version: "0.10"
   - nodejs_version: "0.12"
+  - nodejs_version: "4.1"
 
 install:
   - ps: Install-Product node $env:nodejs_version

docs/sample.tslint.json

@@ -44,7 +44,7 @@
     "no-duplicate-variable": true,
     "no-empty": true,
     "no-eval": true,
-    "no-inferrable-types": true,
+    "no-inferrable-types": false,
     "no-internal-module": true,
     "no-require-imports": true,
     "no-string-literal": true,

src/configuration.ts

@@ -36,33 +36,34 @@ const DEFAULT_CONFIG = {
 };
 
 export function findConfiguration(configFile: string, inputFileLocation: string): any {
-    if (configFile) {
-        return JSON.parse(fs.readFileSync(configFile, "utf8"));
-    }
-
-    // first look for package.json from input file location
-    configFile = findup("package.json", { cwd: inputFileLocation, nocase: true });
+    if (configFile == null) {
+        // first look for package.json from input file location
+        configFile = findup("package.json", { cwd: inputFileLocation, nocase: true });
 
-    if (configFile) {
-        const content = require(configFile);
+        if (configFile) {
+            const content = require(configFile);
 
-        if (content.tslintConfig) {
-            return content.tslintConfig;
+            if (content.tslintConfig) {
+                return content.tslintConfig;
+            }
         }
-    }
 
-    // next look for tslint.json
-    const homeDir = getHomeDir();
-    if (!homeDir) {
-        return undefined;
-    }
+        // next look for tslint.json
+        const homeDir = getHomeDir();
+        if (!homeDir) {
+            return undefined;
+        }
 
-    const defaultPath = path.join(homeDir, CONFIG_FILENAME);
+        const defaultPath = path.join(homeDir, CONFIG_FILENAME);
 
-    configFile = findup(CONFIG_FILENAME, { cwd: inputFileLocation, nocase: true }) || defaultPath;
+        configFile = findup(CONFIG_FILENAME, { cwd: inputFileLocation, nocase: true }) || defaultPath;
+    }
 
     if (fs.existsSync(configFile)) {
-        return JSON.parse(fs.readFileSync(configFile, "utf8"));
+        let fileData = fs.readFileSync(configFile, "utf8");
+        // remove BOM if present
+        fileData = fileData.replace(/^\uFEFF/, "");
+        return JSON.parse(fileData);
     } else {
         return DEFAULT_CONFIG;
     }

src/rules/noUnusedExpressionRule.ts

@@ -42,7 +42,7 @@ class UnusedExpressionWalker extends Lint.RuleWalker {
                 if (expressionText === "\"use strict\"" || expressionText === "'use strict'") {
                     return;
                 }
-            } else if (node.expression.kind === ts.SyntaxKind.DeleteExpression) {
+            } else if (node.expression.kind === ts.SyntaxKind.DeleteExpression || node.expression.kind === ts.SyntaxKind.YieldExpression) {
                 return;
             }
 

test/files/rules/unused.expression.test.ts

@@ -48,3 +48,8 @@ a => fun2(a);
 
 var obj = {};
 delete obj.key;
+function* g(): Iterable<number> {
+    for (let i = 0; i < 100; i++) {
+        yield i;
+    }
+}