vzcode 0.40.0 → 0.42.0

package/dist/assets/{worker-hNl6wfTa.js → worker-pzCcKLRg.js}

@@ -234,4 +234,4 @@ ${M.join(`
 `;P=P.replace(n,"").replace(r,"").replace(v,"$1");let E="";for(;E!==P;)E=P,P=P.replace(_,`${m}$1 $2${m}`);P=P.replace(u,"").trimRight();let R=Object.create(null),q=P.replace(f,"").replace(u,"").trimRight(),j;for(;j=f.exec(P);){let $=j[2].replace(o,"");typeof R[j[1]]=="string"||Array.isArray(R[j[1]])?R[j[1]]=g.concat(R[j[1]],$):R[j[1]]=$}return{comments:q,pragmas:R}}function C({comments:P="",pragmas:m={}}){let E=`
 `,R="/**",q=" *",j=" */",$=Object.keys(m),V=$.flatMap(X=>N(X,m[X])).map(X=>`${q} ${X}${E}`).join("");if(!P){if($.length===0)return"";if($.length===1&&!Array.isArray(m[$[0]])){let X=m[$[0]];return`${R} ${N($[0],X)[0]}${j}`}}let U=P.split(E).map(X=>`${q} ${X}`).join(E)+E;return R+E+(P?U:"")+(P&&$.length?q+E:"")+V+j}function N(P,m){return g.concat(m).map(E=>`@${P} ${E}`.trim())}}),eN={};ZT(eN,{parsers:()=>iC});var iC={};ZT(iC,{typescript:()=>$oe});var aoe=WP(noe(),1);function soe(t,r){let n=new SyntaxError(t+" ("+r.loc.start.line+":"+r.loc.start.column+")");return Object.assign(n,r)}var ooe=soe;function uoe(t){let r=[];for(let n of t)try{return n()}catch(a){r.push(a)}throw Object.assign(new Error("All combinations failed"),{errors:r})}var loe=uoe,tN=WP(ioe(),1);function coe(t){if(!t.startsWith("#!"))return"";let r=t.indexOf(`
 `);return r===-1?t:t.slice(0,r)}var _oe=coe;function poe(t){let r=_oe(t);r&&(t=t.slice(r.length+1));let n=(0,tN.extract)(t),{pragmas:a,comments:o}=(0,tN.parseWithComments)(n);return{shebang:r,text:t,pragmas:a,comments:o}}function doe(t){let{pragmas:r}=poe(t);return Object.prototype.hasOwnProperty.call(r,"prettier")||Object.prototype.hasOwnProperty.call(r,"format")}function foe(t){return Array.isArray(t)&&t.length>0}var rN=foe;function _o(t){var r;let n=t.range?t.range[0]:t.start,a=((r=t.declaration)==null?void 0:r.decorators)??t.decorators;return rN(a)?Math.min(_o(a[0]),n):n}function nc(t){return t.range?t.range[1]:t.end}function moe(t){return t=typeof t=="function"?{parse:t}:t,{astFormat:"estree",hasPragma:doe,locStart:_o,locEnd:nc,...t}}var hoe=moe;function yoe(t){return t.charAt(0)==="#"&&t.charAt(1)==="!"?"//"+t.slice(2):t}var goe=yoe,Doe=(t,r,n)=>{if(!(t&&r==null))return Array.isArray(r)||typeof r=="string"?r[n<0?r.length+n:n]:r.at(n)},nN=Doe;function boe(t){return t=new Set(t),r=>t.has(r==null?void 0:r.type)}var xoe=boe,voe=xoe(["Block","CommentBlock","MultiLine"]),aC=voe;function Toe(t){return aC(t)&&t.value[0]==="*"&&/@(?:type|satisfies)\b/.test(t.value)}var Coe=Toe;function Soe(t){let r=`*${t.value}*`.split(`
-`);return r.length>1&&r.every(n=>n.trimStart()[0]==="*")}var iN=Soe,Th=null;function Ch(t){if(Th!==null&&typeof Th.property){let r=Th;return Th=Ch.prototype=null,r}return Th=Ch.prototype=t??Object.create(null),new Ch}var Aoe=10;for(let t=0;t<=Aoe;t++)Ch();function Eoe(t){return Ch(t)}function woe(t,r="type"){Eoe(t);function n(a){let o=a[r],u=t[o];if(!Array.isArray(u))throw Object.assign(new Error(`Missing visitor keys for '${o}'.`),{node:a});return u}return n}var Foe=woe,koe={ArrayExpression:["elements"],AssignmentExpression:["left","right"],BinaryExpression:["left","right"],InterpreterDirective:[],Directive:["value"],DirectiveLiteral:[],BlockStatement:["directives","body"],BreakStatement:["label"],CallExpression:["callee","arguments","typeParameters","typeArguments"],CatchClause:["param","body"],ConditionalExpression:["test","consequent","alternate"],ContinueStatement:["label"],DebuggerStatement:[],DoWhileStatement:["test","body"],EmptyStatement:[],ExpressionStatement:["expression"],File:["program"],ForInStatement:["left","right","body"],ForStatement:["init","test","update","body"],FunctionDeclaration:["id","params","body","returnType","typeParameters","predicate"],FunctionExpression:["id","params","body","returnType","typeParameters"],Identifier:["typeAnnotation","decorators"],IfStatement:["test","consequent","alternate"],LabeledStatement:["label","body"],StringLiteral:[],NumericLiteral:[],NullLiteral:[],BooleanLiteral:[],RegExpLiteral:[],LogicalExpression:["left","right"],MemberExpression:["object","property"],NewExpression:["callee","arguments","typeParameters","typeArguments"],Program:["directives","body"],ObjectExpression:["properties"],ObjectMethod:["key","params","body","decorators","returnType","typeParameters"],ObjectProperty:["key","value","decorators"],RestElement:["argument","typeAnnotation","decorators"],ReturnStatement:["argument"],SequenceExpression:["expressions"],ParenthesizedExpression:["expression"],SwitchCase:["test","consequent"],SwitchStatement:["discriminant","cases"],ThisExpression:[],ThrowStatement:["argument"],TryStatement:["block","handler","finalizer"],UnaryExpression:["argument"],UpdateExpression:["argument"],VariableDeclaration:["declarations"],VariableDeclarator:["id","init"],WhileStatement:["test","body"],WithStatement:["object","body"],AssignmentPattern:["left","right","decorators","typeAnnotation"],ArrayPattern:["elements","typeAnnotation","decorators"],ArrowFunctionExpression:["params","body","returnType","typeParameters","predicate"],ClassBody:["body"],ClassExpression:["id","body","superClass","mixins","typeParameters","superTypeParameters","implements","decorators","superTypeArguments"],ClassDeclaration:["id","body","superClass","mixins","typeParameters","superTypeParameters","implements","decorators","superTypeArguments"],ExportAllDeclaration:["source","attributes","assertions","exported"],ExportDefaultDeclaration:["declaration"],ExportNamedDeclaration:["declaration","specifiers","source","attributes","assertions"],ExportSpecifier:["local","exported"],ForOfStatement:["left","right","body"],ImportDeclaration:["specifiers","source","attributes","assertions"],ImportDefaultSpecifier:["local"],ImportNamespaceSpecifier:["local"],ImportSpecifier:["local","imported"],ImportExpression:["source","options","attributes"],MetaProperty:["meta","property"],ClassMethod:["key","params","body","decorators","returnType","typeParameters"],ObjectPattern:["properties","typeAnnotation","decorators"],SpreadElement:["argument"],Super:[],TaggedTemplateExpression:["tag","quasi","typeParameters","typeArguments"],TemplateElement:[],TemplateLiteral:["quasis","expressions"],YieldExpression:["argument"],AwaitExpression:["argument"],Import:[],BigIntLiteral:[],ExportNamespaceSpecifier:["exported"],OptionalMemberExpression:["object","property"],OptionalCallExpression:["callee","arguments","typeParameters","typeArguments"],ClassProperty:["key","value","typeAnnotation","decorators","variance"],ClassAccessorProperty:["key","value","typeAnnotation","decorators"],ClassPrivateProperty:["key","value","decorators","typeAnnotation","variance"],ClassPrivateMethod:["key","params","body","decorators","returnType","typeParameters"],PrivateName:["id"],StaticBlock:["body"],AnyTypeAnnotation:[],ArrayTypeAnnotation:["elementType"],BooleanTypeAnnotation:[],BooleanLiteralTypeAnnotation:[],NullLiteralTypeAnnotation:[],ClassImplements:["id","typeParameters"],DeclareClass:["id","typeParameters","extends","mixins","implements","body"],DeclareFunction:["id","predicate"],DeclareInterface:["id","typeParameters","extends","body"],DeclareModule:["id","body"],DeclareModuleExports:["typeAnnotation"],DeclareTypeAlias:["id","typeParameters","right"],DeclareOpaqueType:["id","typeParameters","supertype"],DeclareVariable:["id"],DeclareExportDeclaration:["declaration","specifiers","source"],DeclareExportAllDeclaration:["source"],DeclaredPredicate:["value"],ExistsTypeAnnotation:[],FunctionTypeAnnotation:["typeParameters","params","rest","returnType","this"],FunctionTypeParam:["name","typeAnnotation"],GenericTypeAnnotation:["id","typeParameters"],InferredPredicate:[],InterfaceExtends:["id","typeParameters"],InterfaceDeclaration:["id","typeParameters","extends","body"],InterfaceTypeAnnotation:["extends","body"],IntersectionTypeAnnotation:["types"],MixedTypeAnnotation:[],EmptyTypeAnnotation:[],NullableTypeAnnotation:["typeAnnotation"],NumberLiteralTypeAnnotation:[],NumberTypeAnnotation:[],ObjectTypeAnnotation:["properties","indexers","callProperties","internalSlots"],ObjectTypeInternalSlot:["id","value","optional","static","method"],ObjectTypeCallProperty:["value"],ObjectTypeIndexer:["id","key","value","variance"],ObjectTypeProperty:["key","value","variance"],ObjectTypeSpreadProperty:["argument"],OpaqueType:["id","typeParameters","supertype","impltype"],QualifiedTypeIdentifier:["id","qualification"],StringLiteralTypeAnnotation:[],StringTypeAnnotation:[],SymbolTypeAnnotation:[],ThisTypeAnnotation:[],TupleTypeAnnotation:["types","elementTypes"],TypeofTypeAnnotation:["argument","typeArguments"],TypeAlias:["id","typeParameters","right"],TypeAnnotation:["typeAnnotation"],TypeCastExpression:["expression","typeAnnotation"],TypeParameter:["bound","default","variance"],TypeParameterDeclaration:["params"],TypeParameterInstantiation:["params"],UnionTypeAnnotation:["types"],Variance:[],VoidTypeAnnotation:[],EnumDeclaration:["id","body"],EnumBooleanBody:["members"],EnumNumberBody:["members"],EnumStringBody:["members"],EnumSymbolBody:["members"],EnumBooleanMember:["id","init"],EnumNumberMember:["id","init"],EnumStringMember:["id","init"],EnumDefaultedMember:["id"],IndexedAccessType:["objectType","indexType"],OptionalIndexedAccessType:["objectType","indexType"],JSXAttribute:["name","value"],JSXClosingElement:["name"],JSXElement:["openingElement","children","closingElement"],JSXEmptyExpression:[],JSXExpressionContainer:["expression"],JSXSpreadChild:["expression"],JSXIdentifier:[],JSXMemberExpression:["object","property"],JSXNamespacedName:["namespace","name"],JSXOpeningElement:["name","attributes","typeArguments","typeParameters"],JSXSpreadAttribute:["argument"],JSXText:[],JSXFragment:["openingFragment","children","closingFragment"],JSXOpeningFragment:[],JSXClosingFragment:[],Noop:[],Placeholder:[],V8IntrinsicIdentifier:[],ArgumentPlaceholder:[],BindExpression:["object","callee"],ImportAttribute:["key","value"],Decorator:["expression"],DoExpression:["body"],ExportDefaultSpecifier:["exported"],RecordExpression:["properties"],TupleExpression:["elements"],DecimalLiteral:[],ModuleExpression:["body"],TopicReference:[],PipelineTopicExpression:["expression"],PipelineBareFunction:["callee"],PipelinePrimaryTopicReference:[],TSParameterProperty:["parameter","decorators"],TSDeclareFunction:["id","typeParameters","params","returnType","body"],TSDeclareMethod:["decorators","key","typeParameters","params","returnType"],TSQualifiedName:["left","right"],TSCallSignatureDeclaration:["typeParameters","parameters","typeAnnotation","params","returnType"],TSConstructSignatureDeclaration:["typeParameters","parameters","typeAnnotation","params","returnType"],TSPropertySignature:["key","typeAnnotation"],TSMethodSignature:["key","typeParameters","parameters","typeAnnotation","params","returnType"],TSIndexSignature:["parameters","typeAnnotation"],TSAnyKeyword:[],TSBooleanKeyword:[],TSBigIntKeyword:[],TSIntrinsicKeyword:[],TSNeverKeyword:[],TSNullKeyword:[],TSNumberKeyword:[],TSObjectKeyword:[],TSStringKeyword:[],TSSymbolKeyword:[],TSUndefinedKeyword:[],TSUnknownKeyword:[],TSVoidKeyword:[],TSThisType:[],TSFunctionType:["typeParameters","parameters","typeAnnotation","params","returnType"],TSConstructorType:["typeParameters","parameters","typeAnnotation","params","returnType"],TSTypeReference:["typeName","typeParameters","typeArguments"],TSTypePredicate:["parameterName","typeAnnotation"],TSTypeQuery:["exprName","typeParameters","typeArguments"],TSTypeLiteral:["members"],TSArrayType:["elementType"],TSTupleType:["elementTypes"],TSOptionalType:["typeAnnotation"],TSRestType:["typeAnnotation"],TSNamedTupleMember:["label","elementType"],TSUnionType:["types"],TSIntersectionType:["types"],TSConditionalType:["checkType","extendsType","trueType","falseType"],TSInferType:["typeParameter"],TSParenthesizedType:["typeAnnotation"],TSTypeOperator:["typeAnnotation"],TSIndexedAccessType:["objectType","indexType"],TSMappedType:["typeParameter","typeAnnotation","nameType"],TSLiteralType:["literal"],TSExpressionWithTypeArguments:["expression","typeParameters"],TSInterfaceDeclaration:["id","typeParameters","extends","body"],TSInterfaceBody:["body"],TSTypeAliasDeclaration:["id","typeParameters","typeAnnotation"],TSInstantiationExpression:["expression","typeParameters","typeArguments"],TSAsExpression:["expression","typeAnnotation"],TSSatisfiesExpression:["expression","typeAnnotation"],TSTypeAssertion:["typeAnnotation","expression"],TSEnumDeclaration:["id","members"],TSEnumMember:["id","initializer"],TSModuleDeclaration:["id","body"],TSModuleBlock:["body"],TSImportType:["argument","qualifier","typeParameters","typeArguments"],TSImportEqualsDeclaration:["id","moduleReference"],TSExternalModuleReference:["expression"],TSNonNullExpression:["expression"],TSExportAssignment:["expression"],TSNamespaceExportDeclaration:["id"],TSTypeAnnotation:["typeAnnotation"],TSTypeParameterInstantiation:["params"],TSTypeParameterDeclaration:["params"],TSTypeParameter:["constraint","default","name"],ChainExpression:["expression"],ExperimentalRestProperty:["argument"],ExperimentalSpreadProperty:["argument"],Literal:[],MethodDefinition:["decorators","key","value"],PrivateIdentifier:[],Property:["key","value"],PropertyDefinition:["decorators","key","typeAnnotation","value","variance"],AccessorProperty:["decorators","key","typeAnnotation","value"],TSAbstractAccessorProperty:["decorators","key","typeAnnotation"],TSAbstractKeyword:[],TSAbstractMethodDefinition:["key","value"],TSAbstractPropertyDefinition:["decorators","key","typeAnnotation"],TSAsyncKeyword:[],TSClassImplements:["expression","typeArguments","typeParameters"],TSDeclareKeyword:[],TSEmptyBodyFunctionExpression:["id","typeParameters","params","returnType"],TSExportKeyword:[],TSInterfaceHeritage:["expression","typeArguments","typeParameters"],TSPrivateKeyword:[],TSProtectedKeyword:[],TSPublicKeyword:[],TSReadonlyKeyword:[],TSStaticKeyword:[],TSTemplateLiteralType:["quasis","types"],AsExpression:["expression","typeAnnotation"],BigIntLiteralTypeAnnotation:[],BigIntTypeAnnotation:[],ConditionalTypeAnnotation:["checkType","extendsType","trueType","falseType"],DeclareEnum:["id","body"],InferTypeAnnotation:["typeParameter"],KeyofTypeAnnotation:["argument"],ObjectTypeMappedTypeProperty:["keyTparam","propType","sourceType","variance"],QualifiedTypeofIdentifier:["qualification","id"],TupleTypeLabeledElement:["label","elementType","variance"],TupleTypeSpreadElement:["label","typeAnnotation"],TypeOperator:["typeAnnotation"],TypePredicate:["parameterName","typeAnnotation","asserts"],NGRoot:["node"],NGPipeExpression:["left","right","arguments"],NGChainedExpression:["expressions"],NGEmptyExpression:[],NGMicrosyntax:["body"],NGMicrosyntaxKey:[],NGMicrosyntaxExpression:["expression","alias"],NGMicrosyntaxKeyedExpression:["key","expression"],NGMicrosyntaxLet:["key","value"],NGMicrosyntaxAs:["key","alias"],JsExpressionRoot:["node"],JsonRoot:["node"],TSJSDocAllType:[],TSJSDocUnknownType:[],TSJSDocNullableType:["typeAnnotation"],TSJSDocNonNullableType:["typeAnnotation"],NeverTypeAnnotation:[],UndefinedTypeAnnotation:[],UnknownTypeAnnotation:[],AsConstExpression:["expression"],SatisfiesExpression:["expression","typeAnnotation"]},Poe=Foe(koe),Noe=Poe;function sC(t,r){if(!(t!==null&&typeof t=="object"))return t;if(Array.isArray(t)){for(let a=0;a<t.length;a++)t[a]=sC(t[a],r);return t}let n=Noe(t);for(let a=0;a<n.length;a++)t[n[a]]=sC(t[n[a]],r);return r(t)||t}var oC=sC;function Ioe(t,r){let{parser:n,text:a}=r;if(t.type==="File"&&t.program.interpreter){let{program:{interpreter:u},comments:_}=t;delete t.program.interpreter,_.unshift(u)}if(n==="babel"){let u=new Set;t=oC(t,_=>{var f;(f=_.leadingComments)!=null&&f.some(Coe)&&u.add(_o(_))}),t=oC(t,_=>{if(_.type==="ParenthesizedExpression"){let{expression:f}=_;if(f.type==="TypeCastExpression")return f.range=_.range,f;let v=_o(_);if(!u.has(v))return f.extra={...f.extra,parenthesized:!0},f}})}if(t=oC(t,u=>{switch(u.type){case"LogicalExpression":if(aN(u))return uC(u);break;case"VariableDeclaration":{let _=nN(!1,u.declarations,-1);_!=null&&_.init&&o(u,_);break}case"TSParenthesizedType":return u.typeAnnotation;case"TSTypeParameter":if(typeof u.name=="string"){let _=_o(u);u.name={type:"Identifier",name:u.name,range:[_,_+u.name.length]}}break;case"TopicReference":t.extra={...t.extra,__isUsingHackPipeline:!0};break;case"ExportAllDeclaration":{let{exported:_}=u;if(n==="meriyah"&&(_==null?void 0:_.type)==="Identifier"){let f=a.slice(_o(_),nc(_));(f.startsWith('"')||f.startsWith("'"))&&(u.exported={...u.exported,type:"Literal",value:u.exported.name,raw:f})}break}case"TSUnionType":case"TSIntersectionType":if(u.types.length===1)return u.types[0];break}}),rN(t.comments)){let u=nN(!1,t.comments,-1);for(let _=t.comments.length-2;_>=0;_--){let f=t.comments[_];nc(f)===_o(u)&&aC(f)&&aC(u)&&iN(f)&&iN(u)&&(t.comments.splice(_+1,1),f.value+="*//*"+u.value,f.range=[_o(f),nc(u)]),u=f}}return t.type==="Program"&&(t.range=[0,a.length]),t;function o(u,_){a[nc(_)]!==";"&&(u.range=[_o(u),nc(_)])}}function aN(t){return t.type==="LogicalExpression"&&t.right.type==="LogicalExpression"&&t.operator===t.right.operator}function uC(t){return aN(t)?uC({type:"LogicalExpression",operator:t.operator,left:uC({type:"LogicalExpression",operator:t.operator,left:t.left,right:t.right.left,range:[_o(t.left),nc(t.right.left)]}),right:t.right.right,range:[_o(t),nc(t)]}):t}var Boe=Ioe,lC={loc:!0,range:!0,comment:!0,tokens:!0,loggerFn:!1,project:[],suppressDeprecatedPropertyWarnings:!0};function Ooe(t){let{message:r,location:n}=t;if(!n)return t;let{start:a,end:o}=n;return ooe(r,{loc:{start:{line:a.line,column:a.column+1},end:{line:o.line,column:o.column+1}},cause:t})}var Loe=t=>/\.(?:js|mjs|cjs|jsx|ts|mts|cts|tsx)$/i.test(t);function Moe(t,r){let n=r==null?void 0:r.filepath;if(n&&Loe(n))return[{...lC,filePath:n}];let a=Roe(t);return[{...lC,jsx:a},{...lC,jsx:!a}]}function joe(t,r){let n=goe(t),a=Moe(t,r),o;try{o=loe(a.map(u=>()=>(0,aoe.parse)(n,u)))}catch({errors:[u]}){throw Ooe(u)}return Boe(o,{text:t})}function Roe(t){return new RegExp(["(?:^[^\"'`]*</)","|","(?:^[^/]{2}.*/>)"].join(""),"m").test(t)}var $oe=hoe(joe),Joe=eN,qoe=Object.freeze({__proto__:null,default:Joe,parsers:iC});const Uoe={js:"babel",jsx:"babel",mjs:"babel",cjs:"babel",ts:"typescript",tsx:"typescript",css:"css",html:"html",json:"json",json5:"json5",md:"markdown",markdown:"markdown"},zoe=[OU,vG,dZ,Vre,qoe,wse];onmessage=async({data:t})=>{const{fileExtension:r,fileText:n,fileId:a}=t,o=Uoe[r];if(!o){postMessage({fileId:a,error:`Unsupported file extension for Prettier: ${r}`});return}try{const u=await gv(n,{parser:o,plugins:zoe});postMessage({fileId:a,fileTextPrettified:u})}catch(u){postMessage({fileId:a,error:u.toString()})}}})();
+`);return r.length>1&&r.every(n=>n.trimStart()[0]==="*")}var iN=Soe,Th=null;function Ch(t){if(Th!==null&&typeof Th.property){let r=Th;return Th=Ch.prototype=null,r}return Th=Ch.prototype=t??Object.create(null),new Ch}var Aoe=10;for(let t=0;t<=Aoe;t++)Ch();function Eoe(t){return Ch(t)}function woe(t,r="type"){Eoe(t);function n(a){let o=a[r],u=t[o];if(!Array.isArray(u))throw Object.assign(new Error(`Missing visitor keys for '${o}'.`),{node:a});return u}return n}var Foe=woe,koe={ArrayExpression:["elements"],AssignmentExpression:["left","right"],BinaryExpression:["left","right"],InterpreterDirective:[],Directive:["value"],DirectiveLiteral:[],BlockStatement:["directives","body"],BreakStatement:["label"],CallExpression:["callee","arguments","typeParameters","typeArguments"],CatchClause:["param","body"],ConditionalExpression:["test","consequent","alternate"],ContinueStatement:["label"],DebuggerStatement:[],DoWhileStatement:["test","body"],EmptyStatement:[],ExpressionStatement:["expression"],File:["program"],ForInStatement:["left","right","body"],ForStatement:["init","test","update","body"],FunctionDeclaration:["id","params","body","returnType","typeParameters","predicate"],FunctionExpression:["id","params","body","returnType","typeParameters"],Identifier:["typeAnnotation","decorators"],IfStatement:["test","consequent","alternate"],LabeledStatement:["label","body"],StringLiteral:[],NumericLiteral:[],NullLiteral:[],BooleanLiteral:[],RegExpLiteral:[],LogicalExpression:["left","right"],MemberExpression:["object","property"],NewExpression:["callee","arguments","typeParameters","typeArguments"],Program:["directives","body"],ObjectExpression:["properties"],ObjectMethod:["key","params","body","decorators","returnType","typeParameters"],ObjectProperty:["key","value","decorators"],RestElement:["argument","typeAnnotation","decorators"],ReturnStatement:["argument"],SequenceExpression:["expressions"],ParenthesizedExpression:["expression"],SwitchCase:["test","consequent"],SwitchStatement:["discriminant","cases"],ThisExpression:[],ThrowStatement:["argument"],TryStatement:["block","handler","finalizer"],UnaryExpression:["argument"],UpdateExpression:["argument"],VariableDeclaration:["declarations"],VariableDeclarator:["id","init"],WhileStatement:["test","body"],WithStatement:["object","body"],AssignmentPattern:["left","right","decorators","typeAnnotation"],ArrayPattern:["elements","typeAnnotation","decorators"],ArrowFunctionExpression:["params","body","returnType","typeParameters","predicate"],ClassBody:["body"],ClassExpression:["id","body","superClass","mixins","typeParameters","superTypeParameters","implements","decorators","superTypeArguments"],ClassDeclaration:["id","body","superClass","mixins","typeParameters","superTypeParameters","implements","decorators","superTypeArguments"],ExportAllDeclaration:["source","attributes","assertions","exported"],ExportDefaultDeclaration:["declaration"],ExportNamedDeclaration:["declaration","specifiers","source","attributes","assertions"],ExportSpecifier:["local","exported"],ForOfStatement:["left","right","body"],ImportDeclaration:["specifiers","source","attributes","assertions"],ImportDefaultSpecifier:["local"],ImportNamespaceSpecifier:["local"],ImportSpecifier:["local","imported"],ImportExpression:["source","options","attributes"],MetaProperty:["meta","property"],ClassMethod:["key","params","body","decorators","returnType","typeParameters"],ObjectPattern:["properties","typeAnnotation","decorators"],SpreadElement:["argument"],Super:[],TaggedTemplateExpression:["tag","quasi","typeParameters","typeArguments"],TemplateElement:[],TemplateLiteral:["quasis","expressions"],YieldExpression:["argument"],AwaitExpression:["argument"],Import:[],BigIntLiteral:[],ExportNamespaceSpecifier:["exported"],OptionalMemberExpression:["object","property"],OptionalCallExpression:["callee","arguments","typeParameters","typeArguments"],ClassProperty:["key","value","typeAnnotation","decorators","variance"],ClassAccessorProperty:["key","value","typeAnnotation","decorators"],ClassPrivateProperty:["key","value","decorators","typeAnnotation","variance"],ClassPrivateMethod:["key","params","body","decorators","returnType","typeParameters"],PrivateName:["id"],StaticBlock:["body"],AnyTypeAnnotation:[],ArrayTypeAnnotation:["elementType"],BooleanTypeAnnotation:[],BooleanLiteralTypeAnnotation:[],NullLiteralTypeAnnotation:[],ClassImplements:["id","typeParameters"],DeclareClass:["id","typeParameters","extends","mixins","implements","body"],DeclareFunction:["id","predicate"],DeclareInterface:["id","typeParameters","extends","body"],DeclareModule:["id","body"],DeclareModuleExports:["typeAnnotation"],DeclareTypeAlias:["id","typeParameters","right"],DeclareOpaqueType:["id","typeParameters","supertype"],DeclareVariable:["id"],DeclareExportDeclaration:["declaration","specifiers","source"],DeclareExportAllDeclaration:["source"],DeclaredPredicate:["value"],ExistsTypeAnnotation:[],FunctionTypeAnnotation:["typeParameters","params","rest","returnType","this"],FunctionTypeParam:["name","typeAnnotation"],GenericTypeAnnotation:["id","typeParameters"],InferredPredicate:[],InterfaceExtends:["id","typeParameters"],InterfaceDeclaration:["id","typeParameters","extends","body"],InterfaceTypeAnnotation:["extends","body"],IntersectionTypeAnnotation:["types"],MixedTypeAnnotation:[],EmptyTypeAnnotation:[],NullableTypeAnnotation:["typeAnnotation"],NumberLiteralTypeAnnotation:[],NumberTypeAnnotation:[],ObjectTypeAnnotation:["properties","indexers","callProperties","internalSlots"],ObjectTypeInternalSlot:["id","value","optional","static","method"],ObjectTypeCallProperty:["value"],ObjectTypeIndexer:["id","key","value","variance"],ObjectTypeProperty:["key","value","variance"],ObjectTypeSpreadProperty:["argument"],OpaqueType:["id","typeParameters","supertype","impltype"],QualifiedTypeIdentifier:["id","qualification"],StringLiteralTypeAnnotation:[],StringTypeAnnotation:[],SymbolTypeAnnotation:[],ThisTypeAnnotation:[],TupleTypeAnnotation:["types","elementTypes"],TypeofTypeAnnotation:["argument","typeArguments"],TypeAlias:["id","typeParameters","right"],TypeAnnotation:["typeAnnotation"],TypeCastExpression:["expression","typeAnnotation"],TypeParameter:["bound","default","variance"],TypeParameterDeclaration:["params"],TypeParameterInstantiation:["params"],UnionTypeAnnotation:["types"],Variance:[],VoidTypeAnnotation:[],EnumDeclaration:["id","body"],EnumBooleanBody:["members"],EnumNumberBody:["members"],EnumStringBody:["members"],EnumSymbolBody:["members"],EnumBooleanMember:["id","init"],EnumNumberMember:["id","init"],EnumStringMember:["id","init"],EnumDefaultedMember:["id"],IndexedAccessType:["objectType","indexType"],OptionalIndexedAccessType:["objectType","indexType"],JSXAttribute:["name","value"],JSXClosingElement:["name"],JSXElement:["openingElement","children","closingElement"],JSXEmptyExpression:[],JSXExpressionContainer:["expression"],JSXSpreadChild:["expression"],JSXIdentifier:[],JSXMemberExpression:["object","property"],JSXNamespacedName:["namespace","name"],JSXOpeningElement:["name","attributes","typeArguments","typeParameters"],JSXSpreadAttribute:["argument"],JSXText:[],JSXFragment:["openingFragment","children","closingFragment"],JSXOpeningFragment:[],JSXClosingFragment:[],Noop:[],Placeholder:[],V8IntrinsicIdentifier:[],ArgumentPlaceholder:[],BindExpression:["object","callee"],ImportAttribute:["key","value"],Decorator:["expression"],DoExpression:["body"],ExportDefaultSpecifier:["exported"],RecordExpression:["properties"],TupleExpression:["elements"],DecimalLiteral:[],ModuleExpression:["body"],TopicReference:[],PipelineTopicExpression:["expression"],PipelineBareFunction:["callee"],PipelinePrimaryTopicReference:[],TSParameterProperty:["parameter","decorators"],TSDeclareFunction:["id","typeParameters","params","returnType","body"],TSDeclareMethod:["decorators","key","typeParameters","params","returnType"],TSQualifiedName:["left","right"],TSCallSignatureDeclaration:["typeParameters","parameters","typeAnnotation","params","returnType"],TSConstructSignatureDeclaration:["typeParameters","parameters","typeAnnotation","params","returnType"],TSPropertySignature:["key","typeAnnotation"],TSMethodSignature:["key","typeParameters","parameters","typeAnnotation","params","returnType"],TSIndexSignature:["parameters","typeAnnotation"],TSAnyKeyword:[],TSBooleanKeyword:[],TSBigIntKeyword:[],TSIntrinsicKeyword:[],TSNeverKeyword:[],TSNullKeyword:[],TSNumberKeyword:[],TSObjectKeyword:[],TSStringKeyword:[],TSSymbolKeyword:[],TSUndefinedKeyword:[],TSUnknownKeyword:[],TSVoidKeyword:[],TSThisType:[],TSFunctionType:["typeParameters","parameters","typeAnnotation","params","returnType"],TSConstructorType:["typeParameters","parameters","typeAnnotation","params","returnType"],TSTypeReference:["typeName","typeParameters","typeArguments"],TSTypePredicate:["parameterName","typeAnnotation"],TSTypeQuery:["exprName","typeParameters","typeArguments"],TSTypeLiteral:["members"],TSArrayType:["elementType"],TSTupleType:["elementTypes"],TSOptionalType:["typeAnnotation"],TSRestType:["typeAnnotation"],TSNamedTupleMember:["label","elementType"],TSUnionType:["types"],TSIntersectionType:["types"],TSConditionalType:["checkType","extendsType","trueType","falseType"],TSInferType:["typeParameter"],TSParenthesizedType:["typeAnnotation"],TSTypeOperator:["typeAnnotation"],TSIndexedAccessType:["objectType","indexType"],TSMappedType:["typeParameter","typeAnnotation","nameType"],TSLiteralType:["literal"],TSExpressionWithTypeArguments:["expression","typeParameters"],TSInterfaceDeclaration:["id","typeParameters","extends","body"],TSInterfaceBody:["body"],TSTypeAliasDeclaration:["id","typeParameters","typeAnnotation"],TSInstantiationExpression:["expression","typeParameters","typeArguments"],TSAsExpression:["expression","typeAnnotation"],TSSatisfiesExpression:["expression","typeAnnotation"],TSTypeAssertion:["typeAnnotation","expression"],TSEnumDeclaration:["id","members"],TSEnumMember:["id","initializer"],TSModuleDeclaration:["id","body"],TSModuleBlock:["body"],TSImportType:["argument","qualifier","typeParameters","typeArguments"],TSImportEqualsDeclaration:["id","moduleReference"],TSExternalModuleReference:["expression"],TSNonNullExpression:["expression"],TSExportAssignment:["expression"],TSNamespaceExportDeclaration:["id"],TSTypeAnnotation:["typeAnnotation"],TSTypeParameterInstantiation:["params"],TSTypeParameterDeclaration:["params"],TSTypeParameter:["constraint","default","name"],ChainExpression:["expression"],ExperimentalRestProperty:["argument"],ExperimentalSpreadProperty:["argument"],Literal:[],MethodDefinition:["decorators","key","value"],PrivateIdentifier:[],Property:["key","value"],PropertyDefinition:["decorators","key","typeAnnotation","value","variance"],AccessorProperty:["decorators","key","typeAnnotation","value"],TSAbstractAccessorProperty:["decorators","key","typeAnnotation"],TSAbstractKeyword:[],TSAbstractMethodDefinition:["key","value"],TSAbstractPropertyDefinition:["decorators","key","typeAnnotation"],TSAsyncKeyword:[],TSClassImplements:["expression","typeArguments","typeParameters"],TSDeclareKeyword:[],TSEmptyBodyFunctionExpression:["id","typeParameters","params","returnType"],TSExportKeyword:[],TSInterfaceHeritage:["expression","typeArguments","typeParameters"],TSPrivateKeyword:[],TSProtectedKeyword:[],TSPublicKeyword:[],TSReadonlyKeyword:[],TSStaticKeyword:[],TSTemplateLiteralType:["quasis","types"],AsExpression:["expression","typeAnnotation"],BigIntLiteralTypeAnnotation:[],BigIntTypeAnnotation:[],ConditionalTypeAnnotation:["checkType","extendsType","trueType","falseType"],DeclareEnum:["id","body"],InferTypeAnnotation:["typeParameter"],KeyofTypeAnnotation:["argument"],ObjectTypeMappedTypeProperty:["keyTparam","propType","sourceType","variance"],QualifiedTypeofIdentifier:["qualification","id"],TupleTypeLabeledElement:["label","elementType","variance"],TupleTypeSpreadElement:["label","typeAnnotation"],TypeOperator:["typeAnnotation"],TypePredicate:["parameterName","typeAnnotation","asserts"],NGRoot:["node"],NGPipeExpression:["left","right","arguments"],NGChainedExpression:["expressions"],NGEmptyExpression:[],NGMicrosyntax:["body"],NGMicrosyntaxKey:[],NGMicrosyntaxExpression:["expression","alias"],NGMicrosyntaxKeyedExpression:["key","expression"],NGMicrosyntaxLet:["key","value"],NGMicrosyntaxAs:["key","alias"],JsExpressionRoot:["node"],JsonRoot:["node"],TSJSDocAllType:[],TSJSDocUnknownType:[],TSJSDocNullableType:["typeAnnotation"],TSJSDocNonNullableType:["typeAnnotation"],NeverTypeAnnotation:[],UndefinedTypeAnnotation:[],UnknownTypeAnnotation:[],AsConstExpression:["expression"],SatisfiesExpression:["expression","typeAnnotation"]},Poe=Foe(koe),Noe=Poe;function sC(t,r){if(!(t!==null&&typeof t=="object"))return t;if(Array.isArray(t)){for(let a=0;a<t.length;a++)t[a]=sC(t[a],r);return t}let n=Noe(t);for(let a=0;a<n.length;a++)t[n[a]]=sC(t[n[a]],r);return r(t)||t}var oC=sC;function Ioe(t,r){let{parser:n,text:a}=r;if(t.type==="File"&&t.program.interpreter){let{program:{interpreter:u},comments:_}=t;delete t.program.interpreter,_.unshift(u)}if(n==="babel"){let u=new Set;t=oC(t,_=>{var f;(f=_.leadingComments)!=null&&f.some(Coe)&&u.add(_o(_))}),t=oC(t,_=>{if(_.type==="ParenthesizedExpression"){let{expression:f}=_;if(f.type==="TypeCastExpression")return f.range=_.range,f;let v=_o(_);if(!u.has(v))return f.extra={...f.extra,parenthesized:!0},f}})}if(t=oC(t,u=>{switch(u.type){case"LogicalExpression":if(aN(u))return uC(u);break;case"VariableDeclaration":{let _=nN(!1,u.declarations,-1);_!=null&&_.init&&o(u,_);break}case"TSParenthesizedType":return u.typeAnnotation;case"TSTypeParameter":if(typeof u.name=="string"){let _=_o(u);u.name={type:"Identifier",name:u.name,range:[_,_+u.name.length]}}break;case"TopicReference":t.extra={...t.extra,__isUsingHackPipeline:!0};break;case"ExportAllDeclaration":{let{exported:_}=u;if(n==="meriyah"&&(_==null?void 0:_.type)==="Identifier"){let f=a.slice(_o(_),nc(_));(f.startsWith('"')||f.startsWith("'"))&&(u.exported={...u.exported,type:"Literal",value:u.exported.name,raw:f})}break}case"TSUnionType":case"TSIntersectionType":if(u.types.length===1)return u.types[0];break}}),rN(t.comments)){let u=nN(!1,t.comments,-1);for(let _=t.comments.length-2;_>=0;_--){let f=t.comments[_];nc(f)===_o(u)&&aC(f)&&aC(u)&&iN(f)&&iN(u)&&(t.comments.splice(_+1,1),f.value+="*//*"+u.value,f.range=[_o(f),nc(u)]),u=f}}return t.type==="Program"&&(t.range=[0,a.length]),t;function o(u,_){a[nc(_)]!==";"&&(u.range=[_o(u),nc(_)])}}function aN(t){return t.type==="LogicalExpression"&&t.right.type==="LogicalExpression"&&t.operator===t.right.operator}function uC(t){return aN(t)?uC({type:"LogicalExpression",operator:t.operator,left:uC({type:"LogicalExpression",operator:t.operator,left:t.left,right:t.right.left,range:[_o(t.left),nc(t.right.left)]}),right:t.right.right,range:[_o(t),nc(t)]}):t}var Boe=Ioe,lC={loc:!0,range:!0,comment:!0,tokens:!0,loggerFn:!1,project:[],suppressDeprecatedPropertyWarnings:!0};function Ooe(t){let{message:r,location:n}=t;if(!n)return t;let{start:a,end:o}=n;return ooe(r,{loc:{start:{line:a.line,column:a.column+1},end:{line:o.line,column:o.column+1}},cause:t})}var Loe=t=>/\.(?:js|mjs|cjs|jsx|ts|mts|cts|tsx)$/i.test(t);function Moe(t,r){let n=r==null?void 0:r.filepath;if(n&&Loe(n))return[{...lC,filePath:n}];let a=Roe(t);return[{...lC,jsx:a},{...lC,jsx:!a}]}function joe(t,r){let n=goe(t),a=Moe(t,r),o;try{o=loe(a.map(u=>()=>(0,aoe.parse)(n,u)))}catch({errors:[u]}){throw Ooe(u)}return Boe(o,{text:t})}function Roe(t){return new RegExp(["(?:^[^\"'`]*</)","|","(?:^[^/]{2}.*/>)"].join(""),"m").test(t)}var $oe=hoe(joe),Joe=eN,qoe=Object.freeze({__proto__:null,default:Joe,parsers:iC});const Uoe={js:"babel",jsx:"babel",mjs:"babel",cjs:"babel",ts:"typescript",tsx:"typescript",css:"css",html:"html",json:"json",json5:"json5",md:"markdown",markdown:"markdown"},zoe=[OU,vG,dZ,Vre,qoe,wse];onmessage=async({data:t})=>{const{fileExtension:r,fileText:n,fileId:a}=t,o=Uoe[r];if(!o){postMessage({fileId:a,error:`Unsupported file extension for Prettier: ${r}`});return}try{const u=await gv(n,{parser:o,plugins:zoe,proseWrap:"always",singleQuote:!0,printWidth:60});postMessage({fileId:a,fileTextPrettified:u})}catch(u){postMessage({fileId:a,error:u.toString()})}}})();

package/dist/index.html

@@ -24,8 +24,8 @@
       href="https://unpkg.com/boxicons@2.0.7/css/boxicons.min.css"
       rel="stylesheet"
     />
-    <script type="module" crossorigin src="/assets/index-oU3BPloT.js"></script>
-    <link rel="stylesheet" crossorigin href="/assets/index-ZDmwFqlb.css">
+    <script type="module" crossorigin src="/assets/index-EvjpKQwB.js"></script>
+    <link rel="stylesheet" crossorigin href="/assets/index-vD_kE3p2.css">
   </head>
   <body>
     <div id="root"></div>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vzcode",
-  "version": "0.40.0",
+  "version": "0.42.0",
   "description": "Multiplayer code editor system",
   "main": "src/index.ts",
   "type": "module",
@@ -36,8 +36,14 @@
     "Visualization"
   ],
   "contributors": [
-    "Curran Kelleher",
-    "Anooj Pai"
+    {
+      "name": "Curran Kelleher",
+      "url": "https://github.com/curran"
+    },
+    {
+      "name": "Anooj Pai",
+      "url": "https://github.com/Anooj-Pai"
+    }
   ],
   "license": "MIT",
   "bugs": {
@@ -51,11 +57,14 @@
     "@codemirror/lang-javascript": "^6.2.1",
     "@codemirror/lang-json": "^6.0.1",
     "@codemirror/lang-markdown": "^6.2.3",
-    "@codemirror/state": "^6.3.2",
+    "@codemirror/state": "^6.3.3",
     "@codemirror/theme-one-dark": "^6.1.2",
     "@codemirror/view": "^6.22.1",
     "@lezer/highlight": "^1.2.0",
+    "@replit/codemirror-indentation-markers": "^6.5.0",
     "@replit/codemirror-interact": "^6.3.0",
+    "@replit/codemirror-minimap": "^0.5.1",
+    "@replit/codemirror-vscode-keymap": "^6.0.2",
     "@teamwork/websocket-json-stream": "^2.0.0",
     "@typescript/vfs": "^1.5.0",
     "@uiw/codemirror-theme-abcdef": "^4.21.21",
@@ -82,19 +91,19 @@
     "react": "^18.2.0",
     "react-bootstrap": "^2.9.1",
     "react-dom": "^18.2.0",
-    "sharedb": "^4.1.1",
+    "sharedb": "^4.1.2",
     "sharedb-client-browser": "^4.4.0",
-    "vizhub-ui": "^3.8.0",
+    "vizhub-ui": "^3.10.0",
     "ws": "^8.14.2"
   },
   "devDependencies": {
-    "@types/react": "^18.2.41",
+    "@types/react": "^18.2.42",
     "@types/react-dom": "^18.2.17",
-    "@vitejs/plugin-react": "^4.2.0",
+    "@vitejs/plugin-react": "^4.2.1",
     "prettier": "^3.1.0",
     "sass": "^1.69.5",
-    "typescript": "^5.3.2",
-    "vite": "^5.0.4",
-    "vitest": "^0.34.6"
+    "typescript": "^5.3.3",
+    "vite": "^5.0.6",
+    "vitest": "^1.0.1"
   }
 }

package/src/client/App/style.scss

@@ -2,7 +2,7 @@
   // --vzcode-font-family: ui-monospace, SFMono-Regular,
   //   'SF Mono', Menlo, Consolas, 'Liberation Mono', monospace !important;
 
-  --vzcode-font-family: 'Inconsolata', monospace !important;
+  --vzcode-font-family: 'Roboto Mono', monospace !important;
   --vzcode-font-size: 16px;
 
   /* Variable for the background color */

package/src/client/CodeEditor/basicSetup.ts

@@ -0,0 +1,73 @@
+// Customized "basic setup" for CodeMirror.
+// Mainly customized to remove keymaps, for compatibility with
+// codemirror-vscode-keymap.
+//
+// Inspired by
+// https://github.com/codemirror/basic-setup/blob/main/src/codemirror.ts
+// https://github.com/replit/codemirror-vscode-keymap/blob/master/dev/basicSetupNoKeymap.ts
+import {
+  highlightSpecialChars,
+  drawSelection,
+  highlightActiveLine,
+  dropCursor,
+  rectangularSelection,
+  crosshairCursor,
+  lineNumbers,
+  highlightActiveLineGutter,
+} from '@codemirror/view';
+import { Extension, EditorState } from '@codemirror/state';
+import {
+  defaultHighlightStyle,
+  syntaxHighlighting,
+  indentOnInput,
+  bracketMatching,
+} from '@codemirror/language';
+import { history } from '@codemirror/commands';
+import { highlightSelectionMatches } from '@codemirror/search';
+import {
+  autocompletion,
+  closeBrackets,
+} from '@codemirror/autocomplete';
+
+export const basicSetup: Extension = (() => [
+  lineNumbers(),
+  highlightActiveLineGutter(),
+  highlightSpecialChars(),
+  history(),
+
+  // Not really a fan of foldGutter.
+  // Unclear if it's really useful.
+  // If we ever want to use it, we should
+  // make sure the styling is decent.
+  //   foldGutter(),
+  drawSelection(),
+  dropCursor(),
+  EditorState.allowMultipleSelections.of(true),
+  indentOnInput(),
+  syntaxHighlighting(defaultHighlightStyle, {
+    fallback: true,
+  }),
+  bracketMatching(),
+  closeBrackets(),
+  // We set this to `false` because that is prescribed by
+  // https://github.com/replit/codemirror-vscode-keymap
+  autocompletion({ defaultKeymap: false }),
+
+  rectangularSelection(),
+  crosshairCursor(),
+  highlightActiveLine(),
+  highlightSelectionMatches(),
+
+  // All of these keymaps are disabled because we use
+  // codemirror-vscode-keymap, which provides its own
+  // keymaps for all of these things.
+  //   keymap.of([
+  //     ...closeBracketsKeymap,
+  //     ...defaultKeymap,
+  //     ...searchKeymap,
+  //     ...historyKeymap,
+  //     // ...foldKeymap,
+  //     ...completionKeymap,
+  //     ...lintKeymap,
+  //   ]),
+])();

package/src/client/CodeEditor/getOrCreateEditor.ts

@@ -1,4 +1,4 @@
-import { EditorView, basicSetup } from 'codemirror';
+import { EditorView } from 'codemirror';
 import {
   Compartment,
   EditorState,
@@ -10,6 +10,9 @@ import { html } from '@codemirror/lang-html';
 import { css } from '@codemirror/lang-css';
 import { json1Sync } from 'codemirror-ot';
 import { autocompletion } from '@codemirror/autocomplete';
+import { indentationMarkers } from '@replit/codemirror-indentation-markers';
+import { showMinimap } from '@replit/codemirror-minimap';
+import { vscodeKeymap } from '@replit/codemirror-vscode-keymap';
 import { Diagnostic, linter } from '@codemirror/lint';
 import { json1Presence, textUnicode } from '../../ot';
 import {
@@ -35,6 +38,8 @@ import { AIAssist } from '../AIAssist';
 import { typeScriptCompletions } from './typeScriptCompletions';
 import { typeScriptLinter } from './typeScriptLinter';
 import { TabState } from '../vzReducer';
+import { keymap } from '@codemirror/view';
+import { basicSetup } from './basicSetup';
 
 // Feature flag to enable TypeScript completions & TypeScript Linter.
 const enableTypeScriptCompletions = true;
@@ -263,6 +268,34 @@ export const getOrCreateEditor = ({
     );
   }
 
+  // Add the extension that provides indentation markers.
+  extensions.push(
+    indentationMarkers({
+      // thickness: 2,
+      colors: {
+        light: '#4d586b',
+        dark: '#4d586b',
+        activeLight: '#8e949f',
+        activeDark: '#8e949f',
+      },
+    }),
+  );
+
+  // Show the minimap
+  // See https://github.com/replit/codemirror-minimap#usage
+  extensions.push(
+    showMinimap.compute(['doc'], () => ({
+      create: () => ({
+        dom: document.createElement('div'),
+      }),
+      // displayText: 'blocks',
+    })),
+  );
+
+  // VSCode keybindings
+  // See https://github.com/replit/codemirror-vscode-keymap#usage
+  extensions.push(keymap.of(vscodeKeymap));
+
   const editor = new EditorView({
     state: EditorState.create({
       doc: text,

package/src/client/CodeEditor/json1PresenceDisplay.ts

@@ -47,44 +47,58 @@ export const json1PresenceDisplay = ({
           }
           // Update decorations to reflect new presence state.
           // TODO consider mutating this rather than recomputing it on each change.
+
+          const presenceDecorations = [];
+
+          // Object.keys(presenceState).map((id) => {
+          for (const id of Object.keys(presenceState)) {
+            const presence = presenceState[id];
+            const { start, end } = presence;
+            const from = start[start.length - 1];
+            const to = end[end.length - 1];
+            const userColor = new ColorHash().rgb(id);
+            const { username } = presence;
+
+            presenceDecorations.push({
+              from,
+              to: from,
+              value: Decoration.widget({
+                side: -1,
+                block: false,
+                widget: new PresenceWidget(
+                  // TODO see if we can figure out why
+                  // updateDOM was not being called when passing
+                  // the presence id as the id
+                  // id,
+                  '' + Math.random(),
+                  userColor,
+                  username,
+                ),
+              }),
+            });
+
+            // This is `true` when the presence is a cursor,
+            // with no selection.
+            if (from !== to) {
+              // This is the case when the presence is a selection.
+              presenceDecorations.push({
+                from,
+                to,
+                value: Decoration.mark({
+                  class: 'cm-json1-presence',
+                  attributes: {
+                    style: `
+                      background-color: rgba(${userColor}, 0.75);
+                      mix-blend-mode: luminosity;
+                      `,
+                  },
+                }),
+              });
+            }
+          }
+
           this.decorations = Decoration.set(
-            Object.keys(presenceState).map((id) => {
-              const presence = presenceState[id];
-              const { start, end } = presence;
-              const from = start[start.length - 1];
-              const to = end[end.length - 1];
-              const userColor = new ColorHash().rgb(id);
-              const { username } = presence;
-              if (from === to) {
-                return {
-                  from,
-                  to,
-                  value: Decoration.widget({
-                    side: -1,
-                    block: false,
-                    widget: new PresenceWidget(
-                      id,
-                      userColor,
-                      username,
-                    ),
-                  }),
-                };
-              } else {
-                return {
-                  from,
-                  to,
-                  value: Decoration.mark({
-                    class: 'cm-json1-presence',
-                    attributes: {
-                      style: `
-                        background-color: rgba(${userColor}, 0.75);
-                        mix-blend-mode: luminosity;
-                        `,
-                    },
-                  }),
-                };
-              }
-            }),
+            presenceDecorations,
             // Without this argument, we get the following error:
             // Uncaught Error: Ranges must be added sorted by `from` position and `startSide`
             true,
@@ -131,6 +145,7 @@ class PresenceWidget extends WidgetType {
   id: string;
   color: string;
   username: Username;
+  timeout: number;
   constructor(
     id: string,
     color: string,
@@ -144,9 +159,11 @@ class PresenceWidget extends WidgetType {
 
   eq(other: PresenceWidget) {
     return other.id === this.id;
+    // return false;
   }
 
   toDOM() {
+    // console.log('inside toDOM');
     const span = document.createElement('span');
     span.setAttribute('aria-hidden', 'true');
     span.className = 'cm-json1-presence';
@@ -165,24 +182,40 @@ class PresenceWidget extends WidgetType {
     userDiv.className = 'remote-cursor-username';
     userDiv.style.top = `-20px`;
     userDiv.style.height = `20px`;
-    userDiv.style.width = `${this.username.length * 11}px`;
+    userDiv.style.width = `${this.username.length * 12}px`;
     userDiv.style.backgroundColor = `rgba(${this.color})`;
     userDiv.style.color = `black`;
-    userDiv.style.textAlign = `center`;
+    // userDiv.style.textAlign = `center`;
     userDiv.appendChild(
       document.createTextNode(this.username),
     );
     span.appendChild(userDiv);
 
     // after 2 seconds of inactivity, username is made less visible
-    setTimeout(() => {
-      userDiv.style.backgroundColor = `rgba(${this.color}, 0.2)`;
-      userDiv.style.color = 'rgba(0,0,0,0.2)';
+    this.timeout = window.setTimeout(() => {
+      // userDiv.style.backgroundColor = `rgba(${this.color}, 0.2)`;
+      // userDiv.style.color = 'rgba(0,0,0,0.2)';
+      userDiv.style.opacity = '0.3';
     }, 2000);
 
     return span;
   }
 
+  // TODO try to use this instead of toDOM
+  // updateDOM(dom: HTMLElement, view: EditorView) {
+  //   console.log('inside updateDOM');
+  //   dom.style.opacity = '1';
+  //   window.clearTimeout(this.timeout);
+
+  //   // after 2 seconds of inactivity, username is made less visible
+  //   this.timeout = window.setTimeout(() => {
+  //     // userDiv.style.backgroundColor = `rgba(${this.color}, 0.2)`;
+  //     // userDiv.style.color = 'rgba(0,0,0,0.2)';
+  //     dom.style.opacity = '0.3';
+  //   }, 2000);
+
+  //   return false;
+  // }
   ignoreEvent() {
     return false;
   }

package/src/client/CodeEditor/style.scss

@@ -12,4 +12,12 @@
     font-family: var(--vzcode-font-family);
     font-size: var(--vzcode-font-size);
   }
+
+  .remote-cursor-username {
+    transition: opacity 1s ease-in-out;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border-radius: 4px;
+  }
 }

package/src/client/CodeEditor/typeScriptCompletions.ts

@@ -96,7 +96,6 @@ export const typeScriptCompletions = ({
           completion.name.startsWith(lastWord),
       );
     }
-
     return {
       from: completionContext.pos,
       // @ts-ignore
@@ -104,12 +103,22 @@ export const typeScriptCompletions = ({
         label: completion.name,
         // Applies autocompletions to be seen in the code Editor
         apply: (view) => {
+          //Calculation to get the new cursor position after the autocompletion
+          const newPosition =
+            completionContext.pos +
+            completion.name.length -
+            lastWord.length;
           view.dispatch({
             changes: {
               from,
               to: completionContext.pos,
               insert: completion.name,
             },
+            // Move the cursor to the end of the autocompletion
+            selection: {
+              anchor: newPosition,
+              head: newPosition,
+            },
           });
         },
       })),

package/src/client/TabList/style.scss

@@ -8,6 +8,7 @@
     // background: #47546b;
     color: #fff;
     font-family: var(--vzcode-font-family);
+    font-weight: 500;
     align-items: center;
     display: flex;
     padding-top: 2px;

package/src/client/VZSidebar/styles.scss

@@ -29,6 +29,8 @@
     cursor: pointer;
     margin: 0 10px;
     border-radius: 4px;
+    font-family: var(--vzcode-font-family);
+    font-weight: 500;
   }
 
   .sidebar-section-hint {

package/src/client/themes/vizhubTheme/index.ts

@@ -30,6 +30,12 @@ import {
   PANIC,
 } from './colors';
 
+// Use semi-bold weight for keywords and other important things
+// const boldWeight = 'bold';
+
+// This looks way better as we are pulling in the semi-bold font from Google Fonts
+const boldWeight = '500';
+
 const defaultSettingsVizhubTheme: CreateThemeOptions['settings'] =
   {
     background: backgroundColor,
@@ -97,7 +103,7 @@ function vizhubThemeInit(
       },
       {
         tag: t.heading,
-        fontWeight: 'bold',
+        fontWeight: boldWeight,
         color: SKY,
       },
       {
@@ -145,7 +151,7 @@ function vizhubThemeInit(
         color: AQUA,
       },
       { tag: [t.angleBracket], color: AQUA },
-      { tag: t.strong, fontWeight: 'bold' },
+      { tag: t.strong, fontWeight: boldWeight },
       { tag: t.emphasis, fontStyle: 'italic' },
       {
         tag: t.strikethrough,

package/src/client/usePrettier/worker.ts

@@ -81,6 +81,13 @@ onmessage = async ({
     const fileTextPrettified = await format(fileText, {
       parser,
       plugins,
+
+      // This helps with Markdown files
+      proseWrap: 'always',
+
+      // Opinionated code style for JavaScript
+      singleQuote: true,
+      printWidth: 60,
     });
 
     postMessage({