Fixes requirejs#388, do not rename function declarations for define

Author: jrburke

.gitignore

@@ -34,6 +34,7 @@ build/tests/lib/mainConfigBaseUrl/www-built
 build/tests/lib/moduleThenPlugin/built.js
 build/tests/lib/modulesExclude/built
 build/tests/lib/nameInsertion/built.js
+build/tests/lib/nameInsertion/nested/built.js
 build/tests/lib/namespace/foo.js
 build/tests/lib/nested/main-built.js
 build/tests/lib/nested/main-builtWithCE.js

build/jslib/transform.js

@@ -103,6 +103,12 @@ define([ './esprima', './parse', 'logger', 'lang'], function (esprima, parse, lo
                         return;
                     }
 
+                    if (prev && prev.type === 'Keyword' &&
+                            prev.value === 'function') {
+                        //A declaration of a define function. Skip it.
+                        return;
+                    }
+
                     next2 = tokens[i + 2];
                     if (!next2) {
                         return;

build/tests/builds.js

@@ -695,6 +695,25 @@ define(['build', 'env!env/file'], function (build, file) {
     );
     doh.run();
 
+    //Make sure a nested function declaration for a define function is not
+    //renamed: https://github.com/jrburke/r.js/issues/388
+    doh.register("nameInsertionNested",
+        [
+            function nameInsertionNested(t) {
+                file.deleteFile("lib/nameInsertion/nested/built.js");
+
+                build(["lib/nameInsertion/nested/build.js"]);
+
+                t.is(nol(c("lib/nameInsertion/nested/expected.js")),
+                     nol(c("lib/nameInsertion/nested/built.js")));
+
+                require._buildReset();
+            }
+
+        ]
+    );
+    doh.run();
+
     doh.register("moduleThenPlugin",
         [
             function moduleThenPlugin(t) {

build/tests/lib/nameInsertion/nested/build.js

@@ -0,0 +1,6 @@
+({
+    baseUrl: '.',
+    name: 'main',
+    out: 'built.js',
+    optimize: 'none'
+})

build/tests/lib/nameInsertion/nested/expected.js

@@ -0,0 +1,12 @@
+
+define("main",[],
+function(){
+    function define(clazz) {
+
+    }
+    return {
+        define : define,
+        extend : extend
+    };
+
+});

build/tests/lib/nameInsertion/nested/main.js

@@ -0,0 +1,11 @@
+define("main",[],
+function(){
+    function define(clazz) {
+
+    }
+    return {
+        define : define,
+        extend : extend
+    };
+
+});