only warn if error in try block

sokra · sokra · commit c75f1c29afd6 · 2012-10-28T22:45:00.000+01:00
diff --git a/lib/buildDeps.js b/lib/buildDeps.js
@@ -348,7 +348,12 @@ function addModule(depTree, context, modu, options, reason, finalCallback) {
 						// create or get the module for each require
 						addModule(depTree, path.dirname(filename), moduleName, options, reason, function(err, moduleId) {
 							if(err) {
-								depTree.errors.push("Cannot find module '" + moduleName + "'\n " + err +
+								var error = false;
+								requires[moduleName].forEach(function(requireItem) {
+									if(!requireItem.inTry)
+										error = true;
+								});
+								(error ? depTree.errors : depTree.warnings).push("Cannot find module '" + moduleName + "'\n " + err +
 									"\n @ " + filename + " (line " + requires[moduleName][0].line + ", column " + requires[moduleName][0].column + ")");
 							} else {
 								requires[moduleName].forEach(function(requireItem) {
diff --git a/lib/parse.js b/lib/parse.js
@@ -44,7 +44,10 @@ function walkStatement(options, context, statement) {
 			walkExpression(options, context, statement.argument);
 		break;
 	case "TryStatement":
+		var oldInTry = context.inTry;
+		context.inTry = true;
 		walkStatement(options, context, statement.block);
+		context.inTry = oldInTry;
 		walkCatchClauses(options, context, statement.handlers);
 		if(statement.finalizer)
 			walkStatement(options, context, statement.finalizer);
@@ -81,12 +84,15 @@ function walkStatement(options, context, statement) {
 		if(options.overwrites.hasOwnProperty(statement.name)) {
 			context.overwrite.push(statement.name);
 		}
+		var oldInTry = context.inTry;
+		context.inTry = false;
 		var old = addOverwrites(options, context, statement.params);
 		if(statement.body.type === "BlockStatement")
 			walkStatement(options, context, statement.body);
 		else
 			walkExpression(options, context, statement.body);
 		context.overwrite.length = old;
+		context.inTry = oldInTry;
 		break;
 	case "VariableDeclaration":
 		if(statement.declarations)
@@ -144,12 +150,15 @@ function walkExpression(options, context, expression) {
 		});
 		break;
 	case "FunctionExpression":
+		var oldInTry = context.inTry;
+		context.inTry = false;
 		var old = addOverwrites(options, context, expression.params);
 		if(expression.body.type === "BlockStatement")
 			walkStatement(options, context, expression.body);
 		else
 			walkExpression(options, context, expression.body);
 		context.overwrite.length = old;
+		context.inTry = oldInTry;
 		break;
 	case "SequenceExpression":
 		if(expression.expressions)
@@ -198,7 +207,8 @@ function walkExpression(options, context, expression) {
 							name: paramItem.value,
 							expressionRange: paramItem.range,
 							line: elements[idx].loc.start.line,
-							column: elements[idx].loc.start.column
+							column: elements[idx].loc.start.column,
+							inTry: context.inTry
 						});
 					});
 				} else if(param.code) {
@@ -233,7 +243,8 @@ function walkExpression(options, context, expression) {
 						requireFunction: true,
 						expressionRange: elements[idx].range,
 						line: elements[idx].loc.start.line,
-						column: elements[idx].loc.start.column
+						column: elements[idx].loc.start.column,
+						inTry: context.inTry
 					});
 				} else {
 					// normal require
@@ -242,7 +253,8 @@ function walkExpression(options, context, expression) {
 						name: param.value,
 						expressionRange: elements[idx].range,
 						line: elements[idx].loc.start.line,
-						column: elements[idx].loc.start.column
+						column: elements[idx].loc.start.column,
+						inTry: context.inTry
 					});
 				}
 			});
@@ -386,7 +398,8 @@ function walkExpression(options, context, expression) {
 						name: paramItem.value,
 						valueRange: paramItem.range,
 						line: expression.loc.start.line,
-						column: expression.loc.start.column
+						column: expression.loc.start.column,
+						inTry: context.inTry
 					});
 				});
 			} else if(param.code) {
@@ -424,7 +437,8 @@ function walkExpression(options, context, expression) {
 					idOnly: true,
 					expressionRange: expression.arguments[0].range,
 					line: expression.loc.start.line,
-					column: expression.loc.start.column
+					column: expression.loc.start.column,
+					inTry: context.inTry
 				});
 			}
 			noCallee = true;
