Merge pull request #4177 from RLovelett/bugfix/typo-in-sourcekitd-test

tkremenek · web-flow · commit 12a9b6c46ced · 2016-08-09T21:24:29.000-07:00
[SourceKit] Fix typo in `sourcekitd-test` error handler response
diff --git a/lib/IDE/SwiftSourceDocInfo.cpp b/lib/IDE/SwiftSourceDocInfo.cpp
@@ -24,15 +24,15 @@ swift::ide::parseLineCol(StringRef LineCol) {
   unsigned Line, Col;
   size_t ColonIdx = LineCol.find(':');
   if (ColonIdx == StringRef::npos) {
-    llvm::errs() << "wrong pos format, it should be '<line>:<column'\n";
+    llvm::errs() << "wrong pos format, it should be '<line>:<column>'\n";
     return None;
   }
   if (LineCol.substr(0, ColonIdx).getAsInteger(10, Line)) {
-    llvm::errs() << "wrong pos format, it should be '<line>:<column'\n";
+    llvm::errs() << "wrong pos format, it should be '<line>:<column>'\n";
     return None;
   }
   if (LineCol.substr(ColonIdx+1).getAsInteger(10, Col)) {
-    llvm::errs() << "wrong pos format, it should be '<line>:<column'\n";
+    llvm::errs() << "wrong pos format, it should be '<line>:<column>'\n";
     return None;
   }
 
diff --git a/tools/SourceKit/tools/sourcekitd-test/TestOptions.cpp b/tools/SourceKit/tools/sourcekitd-test/TestOptions.cpp
@@ -61,15 +61,15 @@ static std::pair<unsigned, unsigned> parseLineCol(StringRef LineCol) {
   unsigned Line, Col;
   size_t ColonIdx = LineCol.find(':');
   if (ColonIdx == StringRef::npos) {
-    llvm::errs() << "wrong pos format, it should be '<line>:<column'\n";
+    llvm::errs() << "wrong pos format, it should be '<line>:<column>'\n";
     exit(1);
   }
   if (LineCol.substr(0, ColonIdx).getAsInteger(10, Line)) {
-    llvm::errs() << "wrong pos format, it should be '<line>:<column'\n";
+    llvm::errs() << "wrong pos format, it should be '<line>:<column>'\n";
     exit(1);
   }
   if (LineCol.substr(ColonIdx+1).getAsInteger(10, Col)) {
-    llvm::errs() << "wrong pos format, it should be '<line>:<column'\n";
+    llvm::errs() << "wrong pos format, it should be '<line>:<column>'\n";
     exit(1);
   }
 

Original file line number	Diff line number	Diff line change
`@@ -24,15 +24,15 @@ swift::ide::parseLineCol(StringRef LineCol) {`
`24`	`24`	`unsigned Line, Col;`
`25`	`25`	`size_t ColonIdx = LineCol.find(':');`
`26`	`26`	`if (ColonIdx == StringRef::npos) {`
`27`		`- llvm::errs() << "wrong pos format, it should be '<line>:<column'\n";`
	`27`	`+ llvm::errs() << "wrong pos format, it should be '<line>:<column>'\n";`
`28`	`28`	`return None;`
`29`	`29`	`}`
`30`	`30`	`if (LineCol.substr(0, ColonIdx).getAsInteger(10, Line)) {`
`31`		`- llvm::errs() << "wrong pos format, it should be '<line>:<column'\n";`
	`31`	`+ llvm::errs() << "wrong pos format, it should be '<line>:<column>'\n";`
`32`	`32`	`return None;`
`33`	`33`	`}`
`34`	`34`	`if (LineCol.substr(ColonIdx+1).getAsInteger(10, Col)) {`
`35`		`- llvm::errs() << "wrong pos format, it should be '<line>:<column'\n";`
	`35`	`+ llvm::errs() << "wrong pos format, it should be '<line>:<column>'\n";`
`36`	`36`	`return None;`
`37`	`37`	`}`
`38`	`38`
Original file line number	Diff line number	Diff line change
`@@ -61,15 +61,15 @@ static std::pair<unsigned, unsigned> parseLineCol(StringRef LineCol) {`
`61`	`61`	`unsigned Line, Col;`
`62`	`62`	`size_t ColonIdx = LineCol.find(':');`
`63`	`63`	`if (ColonIdx == StringRef::npos) {`
`64`		`- llvm::errs() << "wrong pos format, it should be '<line>:<column'\n";`
	`64`	`+ llvm::errs() << "wrong pos format, it should be '<line>:<column>'\n";`
`65`	`65`	`exit(1);`
`66`	`66`	`}`
`67`	`67`	`if (LineCol.substr(0, ColonIdx).getAsInteger(10, Line)) {`
`68`		`- llvm::errs() << "wrong pos format, it should be '<line>:<column'\n";`
	`68`	`+ llvm::errs() << "wrong pos format, it should be '<line>:<column>'\n";`
`69`	`69`	`exit(1);`
`70`	`70`	`}`
`71`	`71`	`if (LineCol.substr(ColonIdx+1).getAsInteger(10, Col)) {`
`72`		`- llvm::errs() << "wrong pos format, it should be '<line>:<column'\n";`
	`72`	`+ llvm::errs() << "wrong pos format, it should be '<line>:<column>'\n";`
`73`	`73`	`exit(1);`
`74`	`74`	`}`
`75`	`75`