From 4b037943e33d017a9c397c7dc15023ba5a60c666 Mon Sep 17 00:00:00 2001
From: Mariana Capelo <mabcapelo@gmail.com>
Date: Tue, 17 May 2022 10:36:50 +0100
Subject: [PATCH] Apply OS changes (#21)

---
 .../os-monaco-core-pipeline.yml               | 63 +++++++++++++++++++
 build/monaco/package.json                     |  2 +-
 src/vs/editor/common/languages.ts             |  4 ++
 .../suggest/browser/suggestWidgetRenderer.ts  | 10 ++-
 4 files changed, 77 insertions(+), 2 deletions(-)
 create mode 100644 build/azure-pipelines/os-monaco-core-pipeline.yml

diff --git a/build/azure-pipelines/os-monaco-core-pipeline.yml b/build/azure-pipelines/os-monaco-core-pipeline.yml
new file mode 100644
index 0000000000000..5f81dca2dadc1
--- /dev/null
+++ b/build/azure-pipelines/os-monaco-core-pipeline.yml
@@ -0,0 +1,63 @@
+pool:
+  vmImage: 'windows-latest'
+
+trigger:
+  branches:
+    include:
+    - main-os
+pr: none
+
+variables:
+  TagName: 'v$(Build.BuildNumber)'
+
+stages:
+- stage: Build
+  displayName: 'Build'
+  jobs:
+  - job: Build
+    displayName: 'Build Job'
+    steps:
+    - task: NodeTool@0
+      inputs:
+        versionSpec: "12.14.1"
+    - script: |
+        yarn
+    - script: |
+       ./node_modules/.bin/gulp editor-distro
+    - task: PublishPipelineArtifact@1
+      inputs:
+        targetPath: './out-monaco-editor-core'
+        artifact: 'artifacts'
+        publishLocation: 'pipeline'
+
+
+- stage: Deploy
+  displayName: 'Deploy'
+  jobs:
+  - deployment: Deploy
+    displayName: 'Deploy to npm private repository and creates a git release'
+    pool:
+      vmImage: 'windows-latest'
+    environment: Automatic-Release
+    strategy:
+      runOnce:
+        deploy:
+          steps:
+          #Creates a Github release
+          - task: GitHubRelease@1
+            inputs:
+              gitHubConnection: 'GitHub Release'
+              repositoryName: '$(Build.Repository.Name)'
+              action: 'create'
+              target: '$(Build.SourceVersion)'
+              tagSource: 'userSpecifiedTag'
+              tag: '$(TagName)'
+              changeLogCompareToRelease: 'lastFullRelease'
+              changeLogType: 'commitBased'
+          #Publishes the package into the private artifact repository
+          - task: Npm@1
+            inputs:
+              command: 'publish'
+              workingDir: '$(Pipeline.Workspace)/artifacts/'
+              publishRegistry: 'useFeed'
+              publishFeed: 'd8b4d1eb-aeb3-4b5b-9b43-37b4fc985e2f'
diff --git a/build/monaco/package.json b/build/monaco/package.json
index 687af0852aafa..625a0ef10c654 100644
--- a/build/monaco/package.json
+++ b/build/monaco/package.json
@@ -1,7 +1,7 @@
 {
   "name": "monaco-editor-core",
   "private": true,
-  "version": "0.0.0",
+  "version": "0.32.1-os",
   "description": "A browser based code editor",
   "author": "Microsoft Corporation",
   "license": "MIT",
diff --git a/src/vs/editor/common/languages.ts b/src/vs/editor/common/languages.ts
index f63fa53e83929..974162c9eaca7 100644
--- a/src/vs/editor/common/languages.ts
+++ b/src/vs/editor/common/languages.ts
@@ -674,6 +674,10 @@ export interface CompletionItem {
 	 * A command that should be run upon acceptance of this item.
 	 */
 	command?: Command;
+	/**
+	* Custom icon to be used (instead of those ones that depend on the completionItem kind)
+	*/
+	customIcon?: HTMLElement;
 
 	/**
 	 * @internal
diff --git a/src/vs/editor/contrib/suggest/browser/suggestWidgetRenderer.ts b/src/vs/editor/contrib/suggest/browser/suggestWidgetRenderer.ts
index ecc1d8446b520..24e6d3441bf73 100644
--- a/src/vs/editor/contrib/suggest/browser/suggestWidgetRenderer.ts
+++ b/src/vs/editor/contrib/suggest/browser/suggestWidgetRenderer.ts
@@ -171,8 +171,16 @@ export class ItemRenderer implements IListRenderer<CompletionItem, ISuggestionTe
 			matches: createMatches(element.score)
 		};
 
+		if (data.iconContainer.firstChild) {
+			data.iconContainer.removeChild(data.iconContainer.firstChild);
+		}
+
 		let color: string[] = [];
-		if (completion.kind === CompletionItemKind.Color && _completionItemColor.extract(element, color)) {
+		if (completion.customIcon) {
+			data.icon.className = 'icon hide';
+			data.iconContainer.className = 'suggest-icon custom-icon';
+			append(data.iconContainer, completion.customIcon);
+		} else if (completion.kind === CompletionItemKind.Color && _completionItemColor.extract(element, color)) {
 			// special logic for 'color' completion items
 			data.icon.className = 'icon customcolor';
 			data.iconContainer.className = 'icon hide';