fixup bound insertion

as3web · Feb 7, 2018 · f2a9a79 · f2a9a79
1 parent c34d078
commit f2a9a79
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/src/emit/emitter.ts b/src/emit/emitter.ts
@@ -1443,20 +1443,21 @@ function emitMethod(emitter:Emitter, node:Node):void {
 	let name = node.findChild(NodeKind.NAME);
 	if (node.kind !== NodeKind.FUNCTION || name.text !== emitter.currentClassName) {
 		let pathToRoot = ClassList.getLastPathToRoot();
-		emitter.ensureImportIdentifier("bound", `${pathToRoot}bound`);
+		emitter.ensureImportIdentifier("bound", `${pathToRoot}bound`); 
+
 		let mods = node.findChild(NodeKind.MOD_LIST);
 		if (mods) {
 			emitter.catchup(mods.start);
 		} else {
-			emitter.catchup(name.start);
+			emitter.catchup(node.start);
 		}
+
 		// insert @bound with equal indentation for the next line
-		emitter.output = emitter.output.replace(/([^\S\n]*)$/, "$1@bound\n$1"); 
-		
+		emitter.output = emitter.output.replace(/([^\S\n]*)$/, "$1@bound\n$1");
+
 		emitClassField(emitter, node);
-		emitter.consume('function', name.start);
+
 		emitter.catchup(name.end);
-		//emitter.insert(" = ");
 
 	} else {
 		let mods = node.findChild(NodeKind.MOD_LIST);