incorporate feedback from @adidahiya on PR for issue (palantir#1598)

jhanschoo · Nov 7, 2017 · fdaa6db · fdaa6db
1 parent e3bb4c5
commit fdaa6db
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/docs/usage/configuration/index.md b/docs/usage/configuration/index.md
@@ -4,7 +4,7 @@ title: Configuring TSLint
 permalink: /usage/configuration/
 ---
 
-### The `tslint` File
+### TSLint Configuration
 
 When using [the CLI][0] or many [third-party tools][1], a file named `tslint.json` or `tslint.yaml` is used to
 configure which rules get run and each of their options.

diff --git a/src/configuration.ts b/src/configuration.ts
@@ -224,7 +224,8 @@ export function loadConfigurationFromPath(configFilePath?: string, originalFileP
             try {
                 if (resolvedConfigFileExt === ".json") {
                     rawConfigFile = JSON.parse(stripComments(fileContent)) as RawConfigFile;
-                } else { // /\.ya?ml/.test(resolvedConfigFileExt) === true
+                } else {
+                    // choose this branch only if /\.ya?ml/.test(resolvedConfigFileExt) === true
                     rawConfigFile = yaml.safeLoad(fileContent, {
                         // Note: yaml.LoadOptions expects a schema value of type "any",
                         // but this trips up the no-unsafe-any rule.