The answer was both. And yes. He thought it was all quite ridiculous.
"Taiko. Unless you do not care for Japanese food, then we could dine elsewhere. It doesn't matter to me." Sherlock wasn't sure about her eating habits. All he ever saw her eat were crisps.