Fix scope of function declaration (#286)

Author: vilchik-elena

its/ruling/src/test/expected/javascript-UnusedVariable.json

@@ -653,18 +653,13 @@
 194,
 ],
 'project:dojo-1.8.1/dojox/mvc/_atBindingMixin.js.uncompressed.js':[
-10,
-14,
 32,
 ],
 'project:dojo-1.8.1/dojox/mvc/parserExtension.js.uncompressed.js':[
 36,
 64,
 64,
 ],
-'project:dojo-1.8.1/dojox/mvc/sync.js.uncompressed.js':[
-55,
-],
 'project:dojo-1.8.1/dojox/rails.js.uncompressed.js':[
 82,
 ],

javascript-frontend/src/main/java/org/sonar/javascript/tree/symbols/HoistedSymbolVisitor.java

@@ -204,7 +204,7 @@ public void visitCatchBlock(CatchBlockTree tree) {
 
   @Override
   public void visitFunctionDeclaration(FunctionDeclarationTree tree) {
-    symbolModel.declareSymbol(tree.name().name(), Symbol.Kind.FUNCTION, currentScope)
+    symbolModel.declareSymbol(tree.name().name(), Symbol.Kind.FUNCTION, getFunctionScope())
       .addUsage(Usage.create(tree.name(), Usage.Kind.DECLARATION));
 
     enterScope(tree);

javascript-frontend/src/test/java/org/sonar/javascript/tree/symbols/ScopeTest.java

@@ -59,7 +59,7 @@ private Set<String> symbols(Scope scope) {
 
   @Test
   public void scopes_number() throws Exception {
-    assertThat(SYMBOL_MODEL.getScopes()).hasSize(23);
+    assertThat(SYMBOL_MODEL.getScopes()).hasSize(25);
   }
 
   @Test
@@ -69,7 +69,7 @@ public void test_global_scope() throws Exception {
     assertThat(scope.isGlobal()).isTrue();
     assertThat(scope.isBlock()).isFalse();
     assertThat(scopeAtLine(1)).isEqualTo(scope);
-    assertThat(symbols(scope)).containsOnly("a", "b", "f", "const1", "let1", "c", "A", "notBlock", "gen", "catch1", "try2", "identifier", "foobar");
+    assertThat(symbols(scope)).containsOnly("a", "b", "f", "const1", "let1", "c", "A", "notBlock", "gen", "catch1", "try2", "identifier", "foobar", "globalFunction");
   }
 
   @Test
@@ -316,4 +316,11 @@ public void test_identifier_scope() throws Exception {
       assertThat(identifier.scope()).isEqualTo(usageScopes.get(identifier.identifierToken().line()));
     }
   }
+
+  @Test
+  public void test_global_function_declaration_in_block() throws Exception {
+    Symbol globalFunction = SYMBOL_MODEL.getSymbols("globalFunction").iterator().next();
+    assertThat(globalFunction.scope().isGlobal()).isTrue();
+
+  }
 }

javascript-frontend/src/test/resources/ast/resolve/scope.js

@@ -111,3 +111,7 @@ if (true) {
 function foobar() {
   console.log(identifier);
 }
+
+if (condition) {
+  function globalFunction(){}
+}