changes for #821, similar to DonJayamanne#917

DonJayamanne · DonJayamanne · commit e4eafdb5bc8d · 2017-05-04T19:15:15.000+10:00
diff --git a/src/client/providers/completionProvider.ts b/src/client/providers/completionProvider.ts
@@ -22,7 +22,7 @@ export class PythonCompletionItemProvider implements vscode.CompletionItemProvid
                 let completionItem = new vscode.CompletionItem(item.text);
                 completionItem.kind = item.type;
                 completionItem.documentation = sigAndDocs[1].length === 0 ? item.description : sigAndDocs[1];
-                completionItem.detail = sigAndDocs[0].split(EOL).join('');
+                completionItem.detail = sigAndDocs[0].split(/\r?\n/).join('');
                 if (pythonSettings.autoComplete.addBrackets === true &&
                     (item.kind === vscode.SymbolKind.Function || item.kind === vscode.SymbolKind.Method)) {
                     completionItem.insertText = item.text + '({{}})';
diff --git a/src/client/providers/jediHelpers.ts b/src/client/providers/jediHelpers.ts
@@ -16,8 +16,8 @@ export function extractSignatureAndDocumentation(definition: proxy.IAutoComplete
     /// ```
     const txt = definition.description || definition.text;
     const rawDocString = typeof definition.raw_docstring === 'string' ? definition.raw_docstring.trim() : '';
-    const firstLineOfRawDocString = rawDocString.length > 0 ? rawDocString.split(EOL)[0] : '';
-    let lines = txt.split(EOL);
+    const firstLineOfRawDocString = rawDocString.length > 0 ? rawDocString.split(/\r?\n/)[0] : '';
+    let lines = txt.split(/\r?\n/);
     const startIndexOfDocString = firstLineOfRawDocString === '' ? -1 : lines.findIndex(line => line.indexOf(firstLineOfRawDocString) === 0);
 
     let signatureLines = startIndexOfDocString === -1 ? [lines.shift()] : lines.splice(0, startIndexOfDocString);
@@ -49,7 +49,7 @@ export function extractSignatureAndDocumentation(definition: proxy.IAutoComplete
 }
 
 export function highlightCode(documentation: string): string {
-    let lines = documentation.split(EOL);
+    let lines = documentation.split(/\r?\n/);
     lines = lines.map(line => {
         if (line.trim().startsWith('>>> ')) {
             return '```python\n' + line.substring(4).trim() + '\n```';
