1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
|
#![warn(rust_2018_idioms)]
use github_rs::client::{Executor, Github};
use regex::Regex;
use serde::Deserialize;
use serde_json::Value;
use thiserror::Error;
#[derive(Debug, Error)]
pub enum Error {
#[error("GitHub client error: {0}")]
Github(String),
#[error("Unable to deserialize")]
Deserialize(#[from] serde_json::error::Error),
}
pub struct Client<'a> {
client: Github,
owner: &'a str,
repo: &'a str,
}
impl<'a> Client<'a> {
pub fn new(token: &str, owner: &'a str, repo: &'a str) -> Self {
let client = Github::new(&token).unwrap();
Client { client, owner, repo }
}
pub fn fetch(&self, id: &str) -> Result<Suggestion, Error> {
let response = self.client
.get()
.repos()
.owner(self.owner)
.repo(self.repo)
.pulls()
.comments()
.id(id)
.execute::<Value>();
match response {
Ok((_, _, Some(json))) => {
let suggestion = serde_json::from_value(json)?;
Ok(suggestion)
},
Ok((_, _, None)) => Err(Error::Github("no response".to_owned())),
Err(e) => Err(Error::Github(e.to_string())),
}
}
}
#[derive(Debug, Deserialize)]
pub struct Suggestion {
#[serde(rename = "diff_hunk")]
diff: String,
#[serde(rename = "body")]
suggestion: String,
}
impl Suggestion {
pub fn patch(&self) -> String {
let mut diff: Vec<_> = self.diff.lines()
.filter(|l| !l.starts_with("-"))
.map(|l| {
if l.starts_with("+") {
return l.replacen("+", " ", 1);
}
l.to_owned()
})
.collect();
let last = diff.len() - 1;
diff[last] = diff.last().unwrap()
.replacen(" ", "-", 1);
diff.push(self.suggestion());
diff.join("\n")
}
fn suggestion(&self) -> String {
let re = Regex::new(r"(?s).*(?-s)```\s*suggestion.*\n").unwrap();
let s = re.replace(&self.suggestion, "+");
s.replace("```", "")
}
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn suggestion_fetch_gets_pull_request_comment() {
let client = Client::new(
env!("GITHUB_TOKEN"),
"cli",
"cli",
);
let suggestion = client.fetch("438947607").unwrap();
println!("{:?}", suggestion);
}
#[test]
fn suggestion_patch_generates_patch() {
// Diff from gabgodBB (https://github.com/gabgodBB) and suggestion from
// probablycorey (https://github.com/probablycorey) in this pull
// request: https://github.com/cli/cli/pull/1123
let suggestion = Suggestion {
diff: r#"@@ -1, 9 +1, 11 @@
package command
import (
+ "bufio" // used to input comment
"errors"
"fmt"
"io"
+ "os" // used to input comment"#.to_owned(),
suggestion: r#"It's ok to leave these uncommented
```suggestion
"os"
```"#.to_owned(),
};
assert_eq!(
suggestion.patch(),
r#"@@ -1, 9 +1, 11 @@
package command
import (
"bufio" // used to input comment
"errors"
"fmt"
"io"
- "os" // used to input comment
+ "os"
"#,
);
}
#[test]
fn unified_diff() {
use unidiff::PatchSet;
let diff = r#"--- a/command/pr.go
+++ b/command/pr.go
@@ -1,9 +1,11 @@
package command
import (
+ "bufio" // used to input comment
"errors"
"fmt"
"io"
+ "os" // used to input comment
"#;
let mut patch = PatchSet::new();
patch.parse(diff).unwrap();
println!("{:?}", patch);
println!("{}", patch);
let lines = patch.files_mut()[0].hunks_mut()[0].lines_mut();
// for line in &lines {
// if line.is_removed() {
// } else if line.is_added() {
// line.line_type = unidiff::LINE_TYPE_CONTEXT.to_owned();
// }
// }
lines
.iter_mut()
.filter(|l| !l.is_removed())
// .map(|l| {
.for_each(|l| {
if l.is_added() {
l.line_type = unidiff::LINE_TYPE_CONTEXT.to_owned();
}
});
lines[lines.len() - 2].line_type = unidiff::LINE_TYPE_REMOVED.to_owned();
patch.files_mut()[0].hunks_mut()[0].append(unidiff::Line::new(
r#" "os""#,
unidiff::LINE_TYPE_ADDED,
));
println!("{}", patch);
}
#[test]
fn patches_file() {
// File::open("../testdata/");
}
}
|
