Merge pull request #56 from CodinGame/fix-csharp-metadata

Fix csharp metadata

Author: CGNonofr

src/extensions.ts

@@ -29,7 +29,7 @@ export class InitializeTextDocumentFeature implements StaticFeature {
 
     const languageClient = this.languageClient
     async function saveFile (textDocument: vscode.TextDocument) {
-      if (documentSelector != null && vscode.languages.match(documentSelector, textDocument) > 0) {
+      if (documentSelector != null && vscode.languages.match(documentSelector, textDocument) > 0 && textDocument.uri.scheme === 'file') {
         await updateFile(textDocument.uri.toString(), textDocument.getText(), languageClient)
 
         // Always send notification even if the server doesn't support it (because csharp register the didSave feature too late)

src/extensions/csharp.ts

@@ -0,0 +1,38 @@
+import { MonacoLanguageClient, ProtocolRequestType } from 'monaco-languageclient'
+import { Uri, ExtensionContext, workspace, CancellationToken } from 'vscode'
+import { ExtensionFeature } from './tools'
+
+const OmnisharpMetadataRequestType = new ProtocolRequestType<{
+  Timeout: number
+  AssemblyName: string
+  Language: string | null
+  ProjectName: string
+  TypeName: string
+  VersionNumber: string | null
+}, {
+  Source: string
+  SourceName: string
+}, never, void, void>('o#/metadata')
+
+export class CsharpExtensionFeature extends ExtensionFeature {
+  constructor (private languageClient: MonacoLanguageClient) {
+    super()
+  }
+
+  activate (context: ExtensionContext): void {
+    context.subscriptions.push(workspace.registerTextDocumentContentProvider('omnisharp-metadata', {
+      provideTextDocumentContent: async (uri: Uri, token: CancellationToken): Promise<string> => {
+        const [, project, assembly, typeName] = /^\/Project\/(.*)\/Assembly\/(.*)\/Symbol\/(.*).cs$/.exec(uri.fsPath)!
+        const { Source } = await this.languageClient.sendRequest(OmnisharpMetadataRequestType, {
+          Timeout: 5000,
+          AssemblyName: assembly!.replace(/\//g, '.'),
+          Language: null,
+          ProjectName: project!,
+          TypeName: typeName!.replace(/\//g, '.'),
+          VersionNumber: null
+        }, token)
+        return Source
+      }
+    }))
+  }
+}

src/services/PopupConsoleWindow.ts

@@ -70,6 +70,7 @@ class PopupOutputChannel implements vscode.OutputChannel {
     contentEl.style.width = '80%'
     contentEl.style.height = '80%'
     contentEl.style.background = 'white'
+    contentEl.style.color = 'black'
     container.style.cursor = 'auto'
     contentEl.innerText = this.logs
     const watcherDisposable = this.onDidChangeLog(() => {

src/staticOptions.ts

@@ -37,10 +37,33 @@ const staticOptions = asLanguageClientOptionsById({
   },
   csharp: {
     documentSelector: [
-      { language: 'csharp' }
+      { scheme: 'file', language: 'csharp' }
     ],
     mutualizable: true,
-    vscodeExtensionIds: ['omnisharp']
+    vscodeExtensionIds: ['omnisharp'],
+    middleware: {
+      async provideDefinition (document, position, token, next) {
+        const definition = await next(document, position, token)
+        // Transform file:/$metadata$/... uris to omnisharp-metadata:/... so we can register a text document content provider
+        // See https://github.com/OmniSharp/omnisharp-roslyn/issues/2238
+        if (definition != null && !Array.isArray(definition)) {
+          const metadataMatch = /^\/\$metadata\$(.*)$/.exec(definition.uri.fsPath)
+          if (metadataMatch != null) {
+            return {
+              ...definition,
+              uri: vscode.Uri.from({ scheme: 'omnisharp-metadata', path: metadataMatch[1] })
+            }
+          }
+        }
+        return definition
+      }
+    },
+    async createAdditionalFeatures (client) {
+      const { CsharpExtensionFeature } = await import('./extensions/csharp')
+      return [
+        new CsharpExtensionFeature(client)
+      ]
+    }
   },
   cpp: {
     documentSelector: [