no-collapsible-if: report on enclosing if as primary location (#115)

Author: andrea-guarino-sonarsource

ruling/snapshots/no-collapsible-if

@@ -1,148 +1,148 @@
-src/angular.js/src/ng/location.js: 933
-src/angular.js/src/ng/parse.js: 1597,1614
-src/angular.js/src/ngRoute/route.js: 661,662
-src/brackets/src/command/KeyBindingManager.js: 685,707
-src/brackets/src/command/Menus.js: 675,1015
-src/brackets/src/document/Document.js: 166,183,302
-src/brackets/src/document/DocumentCommandHandlers.js: 877
-src/brackets/src/document/DocumentManager.js: 128
-src/brackets/src/editor/CodeHintManager.js: 592
-src/brackets/src/editor/Editor.js: 876,2435
-src/brackets/src/editor/ImageViewer.js: 332
-src/brackets/src/extensions/default/CSSCodeHints/main.js: 98,166
-src/brackets/src/extensions/default/DebugCommands/main.js: 495
-src/brackets/src/extensions/default/HTMLCodeHints/main.js: 91,135
-src/brackets/src/extensions/default/InlineColorEditor/ColorEditor.js: 454,686,687
-src/brackets/src/extensions/default/InlineColorEditor/InlineColorEditor.js: 267
-src/brackets/src/extensions/default/InlineTimingFunctionEditor/BezierCurveEditor.js: 168
-src/brackets/src/extensions/default/InlineTimingFunctionEditor/StepEditor.js: 180
-src/brackets/src/extensions/default/JavaScriptCodeHints/main.js: 486
+src/angular.js/src/ng/location.js: 932
+src/angular.js/src/ng/parse.js: 1596,1613
+src/angular.js/src/ngRoute/route.js: 660,661
+src/brackets/src/command/KeyBindingManager.js: 682,706
+src/brackets/src/command/Menus.js: 673,1013
+src/brackets/src/document/Document.js: 164,181,301
+src/brackets/src/document/DocumentCommandHandlers.js: 876
+src/brackets/src/document/DocumentManager.js: 127
+src/brackets/src/editor/CodeHintManager.js: 591
+src/brackets/src/editor/Editor.js: 875,2434
+src/brackets/src/editor/ImageViewer.js: 328
+src/brackets/src/extensions/default/CSSCodeHints/main.js: 95,164
+src/brackets/src/extensions/default/DebugCommands/main.js: 493
+src/brackets/src/extensions/default/HTMLCodeHints/main.js: 90,134
+src/brackets/src/extensions/default/InlineColorEditor/ColorEditor.js: 452,684,686
+src/brackets/src/extensions/default/InlineColorEditor/InlineColorEditor.js: 266
+src/brackets/src/extensions/default/InlineTimingFunctionEditor/BezierCurveEditor.js: 167
+src/brackets/src/extensions/default/InlineTimingFunctionEditor/StepEditor.js: 179
+src/brackets/src/extensions/default/JavaScriptCodeHints/main.js: 485
 src/brackets/src/extensions/default/JavaScriptCodeHints/thirdparty/requirejs/require.js: 12,16
-src/brackets/src/extensions/default/JavaScriptQuickEdit/unittests.js: 152
-src/brackets/src/extensions/default/NavigationAndHistory/NavigationProvider.js: 341
-src/brackets/src/extensions/default/QuickView/main.js: 604
-src/brackets/src/extensions/default/StaticServer/node/node_modules/connect/node_modules/multiparty/node_modules/readable-stream/zlib.js: 232,239,246,253,260,270
-src/brackets/src/extensions/default/UrlCodeHints/main.js: 115,345
-src/brackets/src/filesystem/FileIndex.js: 122
-src/brackets/src/JSUtils/ScopeManager.js: 541
-src/brackets/src/language/CSSUtils.js: 1098,1393,1654
-src/brackets/src/language/HTMLDOMDiff.js: 406,484
-src/brackets/src/language/HTMLSimpleDOM.js: 460
-src/brackets/src/language/HTMLUtils.js: 137
-src/brackets/src/language/JSUtils.js: 137,149,159
-src/brackets/src/language/XMLUtils.js: 78,90,91,103,241
-src/brackets/src/LiveDevelopment/LiveDevMultiBrowser.js: 549,742
-src/brackets/src/LiveDevelopment/MultiBrowserImpl/language/HTMLInstrumentation.js: 149
-src/brackets/src/LiveDevelopment/MultiBrowserImpl/language/HTMLSimpleDOM.js: 422
-src/brackets/src/project/FileSyncManager.js: 128
-src/brackets/src/search/FindBar.js: 366,367,368
-src/brackets/src/search/FindInFiles.js: 383,788
-src/brackets/src/utils/DragAndDrop.js: 110
-src/brackets/src/utils/DropdownEventHandler.js: 309
-src/brackets/src/utils/StringMatch.js: 351
-src/brackets/src/view/MainViewManager.js: 468
-src/brackets/src/view/Pane.js: 948
-src/brackets/src/widgets/Dialogs.js: 193
-src/Chart.js/src/core/core.controller.js: 918
-src/Chart.js/src/core/core.helpers.js: 584
-src/Chart.js/src/core/core.ticks.js: 39
-src/Chart.js/src/scales/scale.linearbase.js: 41,131
-src/create-react-app/packages/react-dev-utils/webpackHotDevClient.js: 90
-src/create-react-app/packages/react-scripts/scripts/eject.js: 154
-src/express/lib/response.js: 200
-src/freeCodeCamp/public/js/lib/loop-protect/loop-protect.js: 241
-src/freeCodeCamp/server/boot/authentication.js: 129
-src/Ghost/core/server/api/users.js: 138
-src/Ghost/core/server/api/utils.js: 349
-src/Ghost/core/server/data/validation/index.js: 198,213,229,250
-src/Ghost/core/server/models/base/index.js: 107,208,214,220,226,248,255,261,802,816
-src/Ghost/core/server/models/plugins/collision.js: 57
-src/Ghost/core/server/models/subscriber.js: 65
-src/Ghost/core/server/models/user.js: 335
-src/Ghost/core/server/services/permissions/public.js: 12
-src/Ghost/core/server/services/url/utils.js: 334
-src/jquery/external/qunit/qunit.js: 107,397
-src/jquery/external/requirejs/require.js: 95,711,1286
-src/jquery/external/sinon/sinon.js: 269,275,631,914,4649
-src/jquery/src/effects.js: 180
-src/jquery/src/event.js: 195,343
-src/jquery/src/event/trigger.js: 126,132
-src/react-native/IntegrationTests/SizeFlexibilityUpdateTest.js: 50,56,62,68
-src/react-native/Libraries/Components/Navigation/NavigatorIOS.ios.js: 705
-src/react-native/Libraries/Components/ScrollView/ScrollView.js: 673,684
-src/react-native/Libraries/Core/InitializeCore.js: 187
-src/react-native/Libraries/Experimental/WindowedListView.js: 419
-src/react-native/Libraries/Lists/VirtualizedList.js: 1414,1520
-src/react-native/Libraries/Network/XHRInterceptor.js: 125
-src/react-native/Libraries/Performance/Systrace.js: 78,94,112
-src/react-native/Libraries/polyfills/Object.es6.js: 36
-src/react-native/Libraries/ReactNative/AppContainer.js: 59,94
-src/react-native/Libraries/Renderer/ReactFabric-dev.js: 589,2856,4804,4813,6156,6350,6462,6470,6516,6524,7253,7318,7436,7497,9805,12437,12472
-src/react-native/Libraries/Renderer/ReactNativeRenderer-dev.js: 634,3306,5140,5149,6492,6686,6798,6806,6852,6860,7589,7654,7772,7833,10175,12807,12842
-src/react-native/Libraries/Renderer/ReactNativeRenderer-prod.js: 1042
-src/react-native/Libraries/Renderer/shims/ReactNativeViewConfigRegistry.js: 37
-src/react-native/Libraries/vendor/core/Map.js: 454
-src/react-native/scripts/run-ci-e2e-tests.js: 50,59
-src/react-router/website/modules/components/DelegateMarkdownLinks.js: 11
-src/react-router/website/modules/LoadServiceWorker.js: 3
-src/react/packages/events/EventPluginUtils.js: 143
-src/react/packages/react-call-return/src/ReactCallReturn.js: 41,64
-src/react/packages/react-dom/src/client/ReactDOM.js: 1007,1025,1309,1315
-src/react/packages/react-dom/src/client/ReactDOMFiberComponent.js: 254,387,388,653,936,1057
-src/react/packages/react-dom/src/client/ReactDOMFiberOption.js: 41
-src/react/packages/react-dom/src/client/ReactDOMFiberSelect.js: 165
-src/react/packages/react-dom/src/events/BeforeInputEventPlugin.js: 226
-src/react/packages/react-dom/src/events/SimpleEventPlugin.js: 277
-src/react/packages/react-dom/src/server/ReactPartialRenderer.js: 180,271,305,433,455,475,515,587,953
-src/react/packages/react-dom/src/shared/CSSPropertyOperations.js: 62
-src/react/packages/react-native-renderer/src/__mocks__/ReactNativeViewConfigRegistry.js: 36
-src/react/packages/react-native-renderer/src/NativeMethodsMixinUtils.js: 30
-src/react/packages/react-reconciler/src/ReactChildFiber.js: 113,506,594,673,792,857,971,1032,1282
-src/react/packages/react-reconciler/src/ReactDebugFiberPerf.js: 244,256
-src/react/packages/react-reconciler/src/ReactFiberClassComponent.js: 663,775,973,1085,1093,1139,1147
-src/react/packages/react-reconciler/src/ReactFiberCommitWork.js: 171,392
-src/react/packages/react-reconciler/src/ReactFiberHydrationContext.js: 283
-src/react/packages/react-reconciler/src/ReactFiberReconciler.js: 325,379
-src/react/packages/react-reconciler/src/ReactFiberScheduler.js: 1168,1190,1207,1248
-src/react/packages/react-reconciler/src/ReactFiberStack.js: 59,89
-src/react/packages/react-reconciler/src/ReactFiberUpdateQueue.js: 157
-src/react/packages/react/src/ReactChildren.js: 165
-src/react/packages/react/src/ReactElement.js: 27,39,214,231,232
-src/react/packages/react/src/ReactElementValidator.js: 196
-src/react/packages/shared/invokeGuardedCallback.js: 56
-src/react/packages/shared/ReactDOMFrameScheduling.js: 25
-src/react/scripts/rollup/shims/react-native/ReactNativeViewConfigRegistry.js: 37
-src/redux/src/combineReducers.js: 125
-src/reveal.js/js/reveal.js: 4174
-src/reveal.js/plugin/markdown/markdown.js: 333
-src/reveal.js/plugin/search/search.js: 54
-src/socket.io/lib/index.js: 364,394
-src/spectrum/api/utils/create-graphql-error-formatter.js: 18
-src/spectrum/shared/graphql/queries/thread/getThreadMessageConnection.js: 58
-src/spectrum/src/components/chatInput/index.js: 263
-src/spectrum/src/components/stripeCardForm/modalWell.js: 33
-src/three.js/editor/js/Sidebar.Object.js: 486
-src/three.js/src/animation/KeyframeTrack.js: 406
-src/three.js/src/core/BufferGeometry.js: 333
-src/three.js/src/extras/core/ShapePath.js: 255
-src/three.js/src/loaders/ImageLoader.js: 78
-src/three.js/src/loaders/JSONLoader.js: 54
-src/three.js/src/loaders/LoadingManager.js: 25
-src/three.js/src/loaders/ObjectLoader.js: 148,644
-src/three.js/src/objects/Mesh.js: 251
-src/three.js/src/renderers/webgl/WebGLCapabilities.js: 46
-src/three.js/src/renderers/webgl/WebGLShadowMap.js: 381
-src/three.js/src/renderers/webgl/WebGLTextures.js: 497
-src/three.js/src/renderers/WebGLRenderer.js: 842,1613
-src/vue/packages/vue-server-renderer/basic.js: 1759
-src/vue/packages/vue-server-renderer/build.js: 1765,4101,5562
-src/vue/packages/vue-template-compiler/build.js: 3075,4189
-src/vue/packages/weex-template-compiler/build.js: 3614
-src/vue/packages/weex-vue-framework/factory.js: 1637,3384,4559,5996,6034
-src/vue/src/compiler/to-function.js: 88
-src/vue/src/core/instance/state.js: 133
-src/vue/src/core/util/props.js: 141
-src/vue/src/core/vdom/create-element.js: 74
-src/vue/src/core/vdom/patch.js: 557,593
-src/vue/src/platforms/web/compiler/directives/model.js: 28
-src/vue/src/platforms/web/runtime/transition-util.js: 103
+src/brackets/src/extensions/default/JavaScriptQuickEdit/unittests.js: 151
+src/brackets/src/extensions/default/NavigationAndHistory/NavigationProvider.js: 340
+src/brackets/src/extensions/default/QuickView/main.js: 603
+src/brackets/src/extensions/default/StaticServer/node/node_modules/connect/node_modules/multiparty/node_modules/readable-stream/zlib.js: 231,238,245,252,259,269
+src/brackets/src/extensions/default/UrlCodeHints/main.js: 113,342
+src/brackets/src/filesystem/FileIndex.js: 117
+src/brackets/src/JSUtils/ScopeManager.js: 540
+src/brackets/src/language/CSSUtils.js: 1097,1391,1652
+src/brackets/src/language/HTMLDOMDiff.js: 402,482
+src/brackets/src/language/HTMLSimpleDOM.js: 459
+src/brackets/src/language/HTMLUtils.js: 136
+src/brackets/src/language/JSUtils.js: 136,148,158
+src/brackets/src/language/XMLUtils.js: 77,89,90,101,240
+src/brackets/src/LiveDevelopment/LiveDevMultiBrowser.js: 547,741
+src/brackets/src/LiveDevelopment/MultiBrowserImpl/language/HTMLInstrumentation.js: 146
+src/brackets/src/LiveDevelopment/MultiBrowserImpl/language/HTMLSimpleDOM.js: 421
+src/brackets/src/project/FileSyncManager.js: 119
+src/brackets/src/search/FindBar.js: 361,366,367
+src/brackets/src/search/FindInFiles.js: 382,786
+src/brackets/src/utils/DragAndDrop.js: 109
+src/brackets/src/utils/DropdownEventHandler.js: 308
+src/brackets/src/utils/StringMatch.js: 350
+src/brackets/src/view/MainViewManager.js: 467
+src/brackets/src/view/Pane.js: 947
+src/brackets/src/widgets/Dialogs.js: 192
+src/Chart.js/src/core/core.controller.js: 917
+src/Chart.js/src/core/core.helpers.js: 583
+src/Chart.js/src/core/core.ticks.js: 38
+src/Chart.js/src/scales/scale.linearbase.js: 39,126
+src/create-react-app/packages/react-dev-utils/webpackHotDevClient.js: 89
+src/create-react-app/packages/react-scripts/scripts/eject.js: 152
+src/express/lib/response.js: 199
+src/freeCodeCamp/public/js/lib/loop-protect/loop-protect.js: 240
+src/freeCodeCamp/server/boot/authentication.js: 128
+src/Ghost/core/server/api/users.js: 137
+src/Ghost/core/server/api/utils.js: 348
+src/Ghost/core/server/data/validation/index.js: 194,211,228,249
+src/Ghost/core/server/models/base/index.js: 105,207,213,219,225,247,254,260,800,813
+src/Ghost/core/server/models/plugins/collision.js: 56
+src/Ghost/core/server/models/subscriber.js: 64
+src/Ghost/core/server/models/user.js: 334
+src/Ghost/core/server/services/permissions/public.js: 11
+src/Ghost/core/server/services/url/utils.js: 333
+src/jquery/external/qunit/qunit.js: 102,396
+src/jquery/external/requirejs/require.js: 94,708,1285
+src/jquery/external/sinon/sinon.js: 268,274,630,913,4648
+src/jquery/src/effects.js: 179
+src/jquery/src/event.js: 192,342
+src/jquery/src/event/trigger.js: 124,126
+src/react-native/IntegrationTests/SizeFlexibilityUpdateTest.js: 49,55,61,67
+src/react-native/Libraries/Components/Navigation/NavigatorIOS.ios.js: 704
+src/react-native/Libraries/Components/ScrollView/ScrollView.js: 672,683
+src/react-native/Libraries/Core/InitializeCore.js: 186
+src/react-native/Libraries/Experimental/WindowedListView.js: 418
+src/react-native/Libraries/Lists/VirtualizedList.js: 1409,1519
+src/react-native/Libraries/Network/XHRInterceptor.js: 124
+src/react-native/Libraries/Performance/Systrace.js: 75,93,111
+src/react-native/Libraries/polyfills/Object.es6.js: 35
+src/react-native/Libraries/ReactNative/AppContainer.js: 58,93
+src/react-native/Libraries/Renderer/ReactFabric-dev.js: 588,2855,4803,4812,6151,6345,6461,6469,6515,6523,7252,7317,7435,7496,9804,12433,12471
+src/react-native/Libraries/Renderer/ReactNativeRenderer-dev.js: 633,3305,5139,5148,6487,6681,6797,6805,6851,6859,7588,7653,7771,7832,10174,12803,12841
+src/react-native/Libraries/Renderer/ReactNativeRenderer-prod.js: 1041
+src/react-native/Libraries/Renderer/shims/ReactNativeViewConfigRegistry.js: 36
+src/react-native/Libraries/vendor/core/Map.js: 453
+src/react-native/scripts/run-ci-e2e-tests.js: 49,58
+src/react-router/website/modules/components/DelegateMarkdownLinks.js: 10
+src/react-router/website/modules/LoadServiceWorker.js: 2
+src/react/packages/events/EventPluginUtils.js: 142
+src/react/packages/react-call-return/src/ReactCallReturn.js: 39,62
+src/react/packages/react-dom/src/client/ReactDOM.js: 1006,1024,1308,1309
+src/react/packages/react-dom/src/client/ReactDOMFiberComponent.js: 253,386,387,652,935,1055
+src/react/packages/react-dom/src/client/ReactDOMFiberOption.js: 40
+src/react/packages/react-dom/src/client/ReactDOMFiberSelect.js: 164
+src/react/packages/react-dom/src/events/BeforeInputEventPlugin.js: 225
+src/react/packages/react-dom/src/events/SimpleEventPlugin.js: 276
+src/react/packages/react-dom/src/server/ReactPartialRenderer.js: 179,270,304,432,454,474,514,586,952
+src/react/packages/react-dom/src/shared/CSSPropertyOperations.js: 61
+src/react/packages/react-native-renderer/src/__mocks__/ReactNativeViewConfigRegistry.js: 35
+src/react/packages/react-native-renderer/src/NativeMethodsMixinUtils.js: 29
+src/react/packages/react-reconciler/src/ReactChildFiber.js: 112,505,593,672,791,856,970,1031,1281
+src/react/packages/react-reconciler/src/ReactDebugFiberPerf.js: 243,255
+src/react/packages/react-reconciler/src/ReactFiberClassComponent.js: 662,770,968,1084,1092,1138,1146
+src/react/packages/react-reconciler/src/ReactFiberCommitWork.js: 170,391
+src/react/packages/react-reconciler/src/ReactFiberHydrationContext.js: 282
+src/react/packages/react-reconciler/src/ReactFiberReconciler.js: 324,378
+src/react/packages/react-reconciler/src/ReactFiberScheduler.js: 1164,1189,1206,1247
+src/react/packages/react-reconciler/src/ReactFiberStack.js: 58,88
+src/react/packages/react-reconciler/src/ReactFiberUpdateQueue.js: 156
+src/react/packages/react/src/ReactChildren.js: 163
+src/react/packages/react/src/ReactElement.js: 26,38,213,230,231
+src/react/packages/react/src/ReactElementValidator.js: 193
+src/react/packages/shared/invokeGuardedCallback.js: 34
+src/react/packages/shared/ReactDOMFrameScheduling.js: 24
+src/react/scripts/rollup/shims/react-native/ReactNativeViewConfigRegistry.js: 36
+src/redux/src/combineReducers.js: 124
+src/reveal.js/js/reveal.js: 4173
+src/reveal.js/plugin/markdown/markdown.js: 332
+src/reveal.js/plugin/search/search.js: 53
+src/socket.io/lib/index.js: 363,393
+src/spectrum/api/utils/create-graphql-error-formatter.js: 17
+src/spectrum/shared/graphql/queries/thread/getThreadMessageConnection.js: 56
+src/spectrum/src/components/chatInput/index.js: 262
+src/spectrum/src/components/stripeCardForm/modalWell.js: 32
+src/three.js/editor/js/Sidebar.Object.js: 484
+src/three.js/src/animation/KeyframeTrack.js: 404
+src/three.js/src/core/BufferGeometry.js: 331
+src/three.js/src/extras/core/ShapePath.js: 252
+src/three.js/src/loaders/ImageLoader.js: 76
+src/three.js/src/loaders/JSONLoader.js: 52
+src/three.js/src/loaders/LoadingManager.js: 23
+src/three.js/src/loaders/ObjectLoader.js: 146,642
+src/three.js/src/objects/Mesh.js: 249
+src/three.js/src/renderers/webgl/WebGLCapabilities.js: 44
+src/three.js/src/renderers/webgl/WebGLShadowMap.js: 379
+src/three.js/src/renderers/webgl/WebGLTextures.js: 492
+src/three.js/src/renderers/WebGLRenderer.js: 840,1611
+src/vue/packages/vue-server-renderer/basic.js: 1758
+src/vue/packages/vue-server-renderer/build.js: 1764,4098,5561
+src/vue/packages/vue-template-compiler/build.js: 3072,4188
+src/vue/packages/weex-template-compiler/build.js: 3613
+src/vue/packages/weex-vue-framework/factory.js: 1636,3383,4556,5995,6033
+src/vue/src/compiler/to-function.js: 87
+src/vue/src/core/instance/state.js: 132
+src/vue/src/core/util/props.js: 140
+src/vue/src/core/vdom/create-element.js: 71
+src/vue/src/core/vdom/patch.js: 556,592
+src/vue/src/platforms/web/compiler/directives/model.js: 25
+src/vue/src/platforms/web/runtime/transition-util.js: 102

src/rules/no-collapsible-if.ts

@@ -47,10 +47,10 @@ const rule: Rule.RuleModule = {
             report(
               context,
               {
-                message: `Merge this if statement with the enclosing one.`,
-                loc: ifKeyword.loc,
+                message: `Merge this if statement with the nested one.`,
+                loc: enclosingIfKeyword.loc,
               },
-              [issueLocation(enclosingIfKeyword.loc, enclosingIfKeyword.loc, `Enclosing "if" statement`)],
+              [issueLocation(ifKeyword.loc, ifKeyword.loc, `Nested "if" statement.`)],
             );
           }
         }

tests/rules/no-collapsible-if.test.ts

@@ -62,37 +62,37 @@ ruleTester.run("no-collapsible-if", rule, {
     {
       code: `
       if (x) {
-    //^^ > {{Enclosing "if" statement}}
+    //^^ > {{Merge this if statement with the nested one.}}
         if (y) {}
-      //^^ {{Merge this if statement with the enclosing one.}}
+      //^^ {{Nested "if" statement.}}
       }`,
       options: ["sonar-runtime"],
       errors: [
         {
           message: JSON.stringify({
             secondaryLocations: [
               {
-                line: 2,
-                column: 6,
-                endLine: 2,
-                endColumn: 8,
-                message: `Enclosing "if" statement`,
+                line: 4,
+                column: 8,
+                endLine: 4,
+                endColumn: 10,
+                message: `Nested "if" statement.`,
               },
             ],
-            message: "Merge this if statement with the enclosing one.",
+            message: "Merge this if statement with the nested one.",
           }),
-          line: 4,
-          column: 9,
-          endLine: 4,
-          endColumn: 11,
+          line: 2,
+          column: 7,
+          endLine: 2,
+          endColumn: 9,
         },
       ],
     },
     {
       code: `
       if (x)
         if(y) {}`,
-      errors: [{ message: "Merge this if statement with the enclosing one." }],
+      errors: [{ message: "Merge this if statement with the nested one." }],
     },
     {
       code: `