d14ca05 · helix · git.iko.soy

helix-core/src/indent.rs+1−4

compare with master

unifiedsplit

@@ -194,10 +194,7 @@ fn get_highest_syntax_node_at_bytepos(syntax: &Syntax, pos: usize) -> Option<Nod

194 let tree = syntax.tree();

195

196 // named_descendant

197− let mut node = match tree.root_node().descendant_for_byte_range(pos, pos) {

197+ let mut node = tree.root_node().descendant_for_byte_range(pos, pos)?;

198− Some(node) => node,

199− None => return None,

200− };

201

198

202 while let Some(parent) = node.parent() {

199 while let Some(parent) = node.parent() {

203 if parent.start_byte() == node.start_byte() {

200 if parent.start_byte() == node.start_byte() {

helix-term/src/commands/dap.rs+1−4

@@ -165,10 +165,7 @@ fn get_breakpoint_at_current_line(editor: &mut Editor) -> Option<(usize, Breakpo

165 let text = doc.text().slice(..);

166

167 let line = doc.selection(view.id).primary().cursor_line(text);

168− let path = match doc.path() {

168+ let path = doc.path()?;

169− Some(path) => path,

170− None => return None,

171− };

172 editor.breakpoints.get(path).and_then(|breakpoints| {

169 editor.breakpoints.get(path).and_then(|breakpoints| {

173 let i = breakpoints.iter().position(|b| b.line == line);

170 let i = breakpoints.iter().position(|b| b.line == line);

174 i.map(|i| (i, breakpoints[i].clone()))

171 i.map(|i| (i, breakpoints[i].clone()))

helix-view/src/gutter.rs+1−6

@@ -119,12 +119,7 @@ pub fn breakpoints<'doc>(

119 Box::new(move |line: usize, _selected: bool, out: &mut String| {

120 let breakpoint = breakpoints

121 .iter()

122− .find(|breakpoint| breakpoint.line == line);

122+ .find(|breakpoint| breakpoint.line == line)?;

123−

124− let breakpoint = match breakpoint {

125− Some(b) => b,

126− None => return None,

127− };

128

123

129 let mut style = if breakpoint.condition.is_some() && breakpoint.log_message.is_some() {

124 let mut style = if breakpoint.condition.is_some() && breakpoint.log_message.is_some() {

130 error.add_modifier(Modifier::UNDERLINED)

125 error.add_modifier(Modifier::UNDERLINED)